2 Commits

Author	SHA1	Message	Date
Russell King	53ffe3b440	[ARM] Merge most of the PXA work for initial merge ... This includes PXA work up to the SPI changes for the initial merge, since e172274ccc depends on the SPI tree being merged. Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig	2008-07-14 23:34:46 +01:00
Mike Rapoport	7c5926d4e8	[ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into xm_x270_defconfig ... Combine cm_x270_defconfig and em_x270_defconfig to allow running the same kernel on both machines Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>	2008-06-02 19:33:31 +01:00