| commit | 53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Mon Jul 14 21:28:25 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Jul 14 23:34:46 2008 +0100 |
| tree | e3ee2f392c5f73c855367cee998fc2e5774fa267 | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 [diff] | |
| parent | cabb352a6455c3550f157909196845f533b0f374 [diff] |
[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