Uwe Kleine-König 2dcf78c0ee 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		2010-07-26 14:27:25 +02:00
..
board-mx51_babbage.c	[PATCH] mxc: Fix pad names for imx51	2010-07-26 14:18:20 +02:00
clock-mx51.c	mx5: Add i2c to Freescale MX51 Babbage HW	2010-07-26 14:17:58 +02:00
cpu.c	i.MX51: determine silicon revision dynamically	2010-03-19 11:18:20 +01:00
crm_regs.h	mxc: Core support for Freescale i.MX5 series	2010-02-09 18:32:16 +02:00
devices.c	Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD	2010-07-26 14:27:25 +02:00
devices.h	mx5: Add i2c to Freescale MX51 Babbage HW	2010-07-26 14:17:58 +02:00
Kconfig	mxc: Add support for the Babbage board (i.MX5)	2010-02-09 18:32:17 +02:00
Makefile	mxc: Add support for the Babbage board (i.MX5)	2010-02-09 18:32:17 +02:00
Makefile.boot	mxc: Add support for the Babbage board (i.MX5)	2010-02-09 18:32:17 +02:00
mm.c	ARM: imx: get rid of mxc_gpio_init	2010-06-24 15:40:40 +02:00