linux/arch/arm/mach-imx
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
include/mach
clk-busy.c
clk-gate2.c
clk-imx1.c
clk-imx6q.c This is the second round of imx-dt patches for 3.7. It's based on 2012-09-20 20:16:27 -07:00
clk-imx21.c
clk-imx25.c
clk-imx27.c
clk-imx31.c
clk-imx35.c Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
clk-imx51-imx53.c Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
clk-pfd.c
clk-pllv1.c
clk-pllv2.c
clk-pllv3.c
clk.c
clk.h
cpu-imx5.c
cpu-imx25.c
cpu-imx27.c
cpu-imx31.c
cpu-imx35.c
cpu_op-mx51.c
cpu_op-mx51.h
crm-regs-imx5.h
crmregs-imx3.h
devices-imx1.h
devices-imx21.h
devices-imx25.h
devices-imx27.h
devices-imx31.h
devices-imx35.h
devices-imx50.h
devices-imx51.h
ehci-imx5.c
ehci-imx25.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx27.c
ehci-imx31.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx35.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
eukrea_mbimx27-baseboard.c
eukrea_mbimxsd25-baseboard.c
eukrea_mbimxsd35-baseboard.c
eukrea_mbimxsd51-baseboard.c
gpc.c
headsmp.S
hotplug.c
imx27-dt.c
imx31-dt.c
imx51-dt.c
iomux-imx31.c
Kconfig
lluart.c
mach-apf9328.c
mach-armadillo5x0.c
mach-bug.c
mach-cpuimx27.c
mach-cpuimx35.c
mach-cpuimx51sd.c
mach-eukrea_cpuimx25.c
mach-imx6q.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
mach-imx27_visstrim_m10.c
mach-imx27ipcam.c
mach-imx27lite.c
mach-imx53.c
mach-kzm_arm11_01.c
mach-mx1ads.c
mach-mx21ads.c
mach-mx25_3ds.c
mach-mx27_3ds.c
mach-mx27ads.c
mach-mx31_3ds.c
mach-mx31ads.c
mach-mx31lilly.c
mach-mx31lite.c
mach-mx31moboard.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mach-mx35_3ds.c
mach-mx50_rdp.c
mach-mx51_3ds.c
mach-mx51_babbage.c
mach-mxt_td60.c
mach-pca100.c
mach-pcm037.c
mach-pcm037_eet.c
mach-pcm038.c
mach-pcm043.c
mach-qong.c
mach-scb9328.c
mach-vpr200.c
Makefile Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
Makefile.boot
mm-imx1.c
mm-imx3.c
mm-imx5.c
mm-imx21.c
mm-imx25.c
mm-imx27.c
mmdc.c
mx1-camera-fiq-ksym.c
mx1-camera-fiq.S
mx31lilly-db.c
mx31lite-db.c
mx31moboard-devboard.c
mx31moboard-marxbot.c
mx31moboard-smartbot.c
pcm037.h
pcm970-baseboard.c
platsmp.c
pm-imx3.c
pm-imx5.c
pm-imx6q.c
pm-imx27.c
src.c