[ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into xm_x270_defconfig
authorMike Rapoport <mike@compulab.co.il>
Mon, 12 May 2008 10:36:28 +0000 (11:36 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 2 Jun 2008 18:33:31 +0000 (19:33 +0100)
commit7c5926d4e8d0f3d36688df4652b8f9f9ef0d7945
tree3f0eb0f6988756e5e5a2a4a2c1aea6b85c91be20
parent63b43f5d3264f4d70b5d29885997253d33259744
[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>
arch/arm/configs/cm_x270_defconfig [deleted file]
arch/arm/configs/em_x270_defconfig [deleted file]
arch/arm/configs/xm_x270_defconfig [new file with mode: 0644]