linux/arch/arm/mach-imx
Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 22:44:18 +01:00
..
include/mach
cache-l2x0.c
clock-imx1.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx21.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx25.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
clock-imx27.c net/fec: gasket needs to be enabled for some i.mx 2011-07-27 09:30:50 +08:00
clock-imx31.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
clock-imx35.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
cpu-imx27.c
cpu-imx31.c
cpu-imx35.c
crmregs-imx31.h
devices-imx1.h
devices-imx21.h
devices-imx25.h
devices-imx27.h
devices-imx31.h
devices-imx35.h
dma-v1.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
ehci-imx25.c
ehci-imx27.c
ehci-imx31.c
ehci-imx35.c
eukrea_mbimx27-baseboard.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
eukrea_mbimxsd25-baseboard.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea_mbimxsd35-baseboard.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
iomux-imx31.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig ARM: mx31pdk: Fix build by passing IMX_HAVE_PLATFORM_MXC_MMC 2011-09-19 12:27:13 +02:00
mach-apf9328.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-armadillo5x0.c
mach-bug.c
mach-cpuimx27.c ARM: 7051/1: cpuimx* boards: fix mach-types errors 2011-08-22 15:57:22 +01:00
mach-cpuimx35.c ARM: 7051/1: cpuimx* boards: fix mach-types errors 2011-08-22 15:57:22 +01:00
mach-eukrea_cpuimx25.c ARM: 7051/1: cpuimx* boards: fix mach-types errors 2011-08-22 15:57:22 +01:00
mach-imx27_visstrim_m10.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
mach-imx27ipcam.c
mach-imx27lite.c
mach-kzm_arm11_01.c
mach-mx1ads.c
mach-mx21ads.c
mach-mx25_3ds.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
mach-mx27_3ds.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-mx27ads.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
mach-mx31_3ds.c ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT' 2011-10-25 11:17:44 +02:00
mach-mx31ads.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
mach-mx31lilly.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
mach-mx31lite.c
mach-mx31moboard.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-mx35_3ds.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-mxt_td60.c
mach-pca100.c
mach-pcm037_eet.c
mach-pcm037.c
mach-pcm038.c
mach-pcm043.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
mach-qong.c
mach-scb9328.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-vpr200.c
Makefile
Makefile.boot
mm-imx1.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx21.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mm-imx25.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mm-imx27.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mm-imx31.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mm-imx35.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mx1-camera-fiq-ksym.c
mx1-camera-fiq.S
mx31lilly-db.c
mx31lite-db.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
mx31moboard-devboard.c
mx31moboard-marxbot.c
mx31moboard-smartbot.c
pcm037.h
pcm970-baseboard.c
pm-imx27.c