Russell King
e4cc8fca1c
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
...
Conflicts:
arch/arm/configs/magician_defconfig
2009-02-07 21:43:28 +00:00
Mike Rapoport
432dc14fa4
[ARM] pxa: add em_x270_defconfig for EM-X270 and eXeda
...
machines
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-02-02 17:40:18 +08: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
Mike Rapoport
3d50527bbf
[ARM] 4475/2: EM-x270 board support
...
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-07-20 17:45:15 +01:00
