Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-07-13 | Merge branch 'pxa' into devel | Russell King | |
Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig | |||
2008-06-02 | [ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into ↵ | Mike Rapoport | |
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> |