Arnd Bergmann c72dbae971 Merge branch 'imx/devel' into next/dt ... The board changes in the imx/devel branch conflict with other changes in the device imx/dt branch. Conflicts: arch/arm/mach-mx5/board-mx53_loco.c arch/arm/mach-mx5/board-mx53_smd.c arch/arm/plat-mxc/include/mach/common.h arch/arm/plat-mxc/include/mach/memory.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-11-01 17:12:22 +01:00
..
board-cpuimx51.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-cpuimx51sd.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx50_rdp.c
board-mx51_3ds.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx51_babbage.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx51_efikamx.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx51_efikasb.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx53_ard.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx53_evk.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx53_loco.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
board-mx53_smd.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
clock-mx51-mx53.c	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
cpu_op-mx51.c
cpu_op-mx51.h
cpu.c
crm_regs.h
devices-imx50.h
devices-imx51.h
devices-imx53.h
efika.h
ehci.c
eukrea_mbimx51-baseboard.c
eukrea_mbimxsd-baseboard.c
imx51-dt.c
imx53-dt.c
Kconfig	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
Makefile	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
Makefile.boot
mm.c
mx51_efika.c
pm-imx5.c
system.c