tree 8ca5c4c7f35c9a9ab07fcd9732124c905e609aa1
parent 6b6322676add0fa2713d0ec89a28390fd4d907f5
parent 5109a4597f7e758b8d20694392d0361a0b4c43b1
author Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1277892984 +0200
committer Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1280147245 +0200

Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD

There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Conflicts:
	arch/arm/mach-imx/Makefile
	arch/arm/mach-imx/devices.c
	arch/arm/mach-imx/devices.h
	arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
	arch/arm/mach-mx2/Kconfig
	arch/arm/mach-mx25/Makefile
	arch/arm/mach-mx25/devices.c
	arch/arm/plat-mxc/include/mach/mx25.h
	arch/arm/plat-mxc/include/mach/mxc_nand.h