tmp_suning_uos_patched/arch/arm/mach-mx3
Sascha Hauer 0e44e05958 Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-06 09:36:17 +01:00
..
clock-imx31.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
clock-imx35.c ARM: imx: fix/define clocks and create devices for imx dma 2010-10-11 15:30:31 +02:00
cpu.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
crm_regs.h
devices-imx31.h ARM: mx3: dynamically allocate imx-keypad devices 2010-11-19 21:54:36 +01:00
devices-imx35.h ARM: imx: fix name for functions adding sdhci-esdhc-imx devices 2010-11-19 21:59:51 +01:00
devices.c ARM: mx3: dynamically allocate imx-keypad devices 2010-11-19 21:54:36 +01:00
devices.h ARM: mx3: dynamically allocate imx-keypad devices 2010-11-19 21:54:36 +01:00
eukrea_mbimxsd-baseboard.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
iomux-imx31.c
Kconfig ARM i.MX irq: Compile avic irq code only on SoCs that need it 2010-11-24 10:08:58 +01:00
mach-armadillo5x0.c ARM: mx3: dynamically allocate mxc-ehci devices 2010-11-19 21:54:35 +01:00
mach-cpuimx35.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
mach-kzm_arm11_01.c ARM: imx: refactor the io mapping macro 2010-11-17 08:58:08 +01:00
mach-mx31_3ds.c mx31_3ds: Add touchscreen support 2010-11-24 09:57:05 +01:00
mach-mx31ads.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mx31lilly.c ARM: mx3: dynamically allocate mxc-ehci devices 2010-11-19 21:54:35 +01:00
mach-mx31lite.c ARM: mx3: dynamically allocate mxc-ehci devices 2010-11-19 21:54:35 +01:00
mach-mx31moboard.c ARM: mx3: dynamically allocate mxc-ehci devices 2010-11-19 21:54:35 +01:00
mach-mx35_3ds.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
mach-pcm037_eet.c ARM: mx3/mach-pcm037_eet: Fix section mismatch for eet_init_devices() 2010-11-17 10:01:29 +01:00
mach-pcm037.c Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38 2010-11-24 08:24:29 +01:00
mach-pcm043.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
mach-qong.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
Makefile ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 2010-11-19 21:54:35 +01:00
Makefile.boot
mm.c ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 2010-11-19 21:54:35 +01:00
mx31lilly-db.c ARM: mx3: dynamically register mxc-mmc devices 2010-11-19 21:54:35 +01:00
mx31lite-db.c ARM: mx3: dynamically allocate imx2-wdt devices 2010-11-19 21:54:36 +01:00
mx31moboard-devboard.c ARM: mx3: dynamically allocate mxc-ehci devices 2010-11-19 21:54:35 +01:00
mx31moboard-marxbot.c Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38 2010-11-24 08:24:29 +01:00
mx31moboard-smartbot.c Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38 2010-11-24 08:24:29 +01:00
pcm037.h