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
..
devices	ARM: imx: dynamically register imx-uart devices (generic part)	2010-06-30 09:00:52 +02:00
include/mach	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
audmux-v1.c	ARM: mxc: remove paragraphs with old address of the FSF	2010-06-30 09:00:28 +02:00
audmux-v2.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
clock.c	arm: mxc: utilise usecount field in clock operations	2010-07-26 14:17:57 +02:00
cpu.c	[ARM] MXC: add cpu_is_ macros	2009-03-13 10:34:26 +01:00
devices.c	ARM: imx: new helper function imx_add_platform_device	2010-06-30 09:00:03 +02:00
ehci.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
gpio.c	mx5: Add registration of GPIOs for MX5 devices	2010-04-22 16:53:23 +02:00
iomux-v1.c	arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode	2010-02-24 10:07:16 +01:00
iomux-v3.c	mxc: iomux v3: remove resource handling	2009-11-24 08:39:43 +01:00
irq.c	ARM: imx: get rid of mxc_gpio_init	2010-06-24 15:40:40 +02:00
Kconfig	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
Makefile	ARM: imx: Change the way nand devices are registered (generic part)	2010-06-30 09:00:29 +02:00
pwm.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ssi-fiq-ksym.c	ASoC: Add a new imx-ssi sound driver	2010-01-17 11:09:46 +00:00
ssi-fiq.S	ASoC: Add a new imx-ssi sound driver	2010-01-17 11:09:46 +00:00
system.c	ARM: mxc: remove paragraphs with old address of the FSF	2010-06-30 09:00:28 +02:00
time.c	arm/plat-mxc: Fix forgotten renaming in timer.c	2010-04-23 09:22:30 +02:00
tzic.c	ARM: imx: get rid of mxc_gpio_init	2010-06-24 15:40:40 +02:00
ulpi.c	MXC: Add support for ULPI Viewports	2009-11-14 10:29:15 +01:00