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
..
2011-03-23 15:08:13 +01:00
2010-06-24 15:40:36 +02:00
2010-06-24 15:40:36 +02:00
2010-06-24 15:40:36 +02:00
2010-06-24 15:40:36 +02:00
2011-11-01 17:12:22 +01:00
2009-04-07 10:18:32 +01:00
2011-09-20 14:53:00 +02:00
2010-10-19 18:44:57 +02:00
2009-02-26 14:00:58 -07:00
2011-05-19 13:11:09 +02:00
2011-09-20 09:55:06 +02:00
2011-03-31 11:26:23 -03:00
2009-05-07 16:15:58 +02:00