diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-14 22:28:25 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-15 00:34:46 +0200 |
| commit | 53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d (patch) | |
| tree | e3ee2f392c5f73c855367cee998fc2e5774fa267 /include/asm-arm/arch-loki | |
| parent | Merge branch 'imx' into devel (diff) | |
| parent | [ARM] 5084/1: zylonite: Register AC97 device (diff) | |
| download | linux-53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d.tar.xz linux-53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d.zip | |
[ARM] Merge most of the PXA work for initial merge
This includes PXA work up to the SPI changes for the initial merge,
since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI
tree being merged.
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'include/asm-arm/arch-loki')
0 files changed, 0 insertions, 0 deletions