kernel_optimize_test/arch/arm/mach-imx
Arnd Bergmann 6b204283f2 Merge branch 'imx/pinctrl' into imx/dt
Conflicts:
	drivers/mmc/host/sdhci-esdhc-imx.c
	drivers/net/ethernet/freescale/fec.c
	drivers/spi/spi-imx.c
	drivers/tty/serial/imx.c

This resolves some simply but annoying conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 15:23:13 +02:00
..
include/mach
clk-busy.c ARM: imx: add common clock support for clk busy 2012-05-02 12:08:26 +02:00
clk-gate2.c ARM i.MX: Add common clock support for 2bit gate 2012-05-02 12:08:13 +02:00
clk-imx1.c ARM i.MX1: implement clocks using common clock framework 2012-05-02 12:08:32 +02:00
clk-imx6q.c ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 2012-05-11 15:18:06 +08:00
clk-imx21.c ARM i.MX21: implement clocks using common clock framework 2012-05-02 12:08:33 +02:00
clk-imx25.c ARM i.MX25: implement clocks using common clock framework 2012-05-02 12:08:32 +02:00
clk-imx27.c ARM i.MX27: implement clocks using common clock framework 2012-05-02 12:08:34 +02:00
clk-imx31.c ARM i.MX31: implement clocks using common clock framework 2012-05-02 12:08:34 +02:00
clk-imx35.c ARM i.MX35: implement clocks using common clock framework 2012-05-09 08:59:34 +02:00
clk-imx51-imx53.c ARM: imx: add more imx5 ssi clocks 2012-05-11 17:21:17 +08:00
clk-pfd.c ARM: imx: add common clock support for pfd 2012-05-02 12:08:20 +02:00
clk-pllv1.c ARM i.MX: Add common clock support for pllv1 2012-05-02 12:07:53 +02:00
clk-pllv2.c ARM i.MX: Add common clock support for pllv2 2012-05-02 12:07:59 +02:00
clk-pllv3.c ARM: imx: add common clock support for pllv3 2012-05-02 12:08:06 +02:00
clk.h ARM: imx: add common clock support for clk busy 2012-05-02 12:08:26 +02:00
cpu_op-mx51.c
cpu_op-mx51.h
cpu-imx5.c
cpu-imx25.c
cpu-imx27.c
cpu-imx31.c
cpu-imx35.c
crm-regs-imx5.h
crmregs-imx3.h ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
devices-imx1.h
devices-imx21.h
devices-imx25.h
devices-imx27.h
devices-imx31.h
devices-imx35.h
devices-imx50.h
devices-imx51.h
devices-imx53.h
efika.h
ehci-imx5.c
ehci-imx25.c
ehci-imx27.c
ehci-imx31.c
ehci-imx35.c
eukrea_mbimx27-baseboard.c
eukrea_mbimx51-baseboard.c
eukrea_mbimxsd-baseboard.c
eukrea_mbimxsd25-baseboard.c
eukrea_mbimxsd35-baseboard.c
gpc.c
head-v7.S
hotplug.c
imx27-dt.c ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple() 2012-04-18 11:52:24 +02:00
imx51-dt.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
imx53-dt.c Merge branch 'imx/pinctrl' into imx/dt 2012-05-14 15:23:13 +02:00
iomux-imx31.c
Kconfig Merge branch 'imx/pinctrl' into imx/dt 2012-05-14 15:23:13 +02:00
lluart.c ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
mach-apf9328.c
mach-armadillo5x0.c ARM: armadillo5x0: Fix smsc911x driver probe 2012-04-02 16:31:22 +02:00
mach-bug.c
mach-cpuimx27.c
mach-cpuimx35.c
mach-cpuimx51.c
mach-cpuimx51sd.c
mach-eukrea_cpuimx25.c
mach-imx6q.c Merge branch 'imx/pinctrl' into imx/dt 2012-05-14 15:23:13 +02:00
mach-imx27_visstrim_m10.c
mach-imx27ipcam.c
mach-imx27lite.c
mach-kzm_arm11_01.c ARM: kzm_arm11_01: Fix smsc911x driver probe 2012-04-02 16:31:22 +02:00
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 ARM: mx31lilly: Fix smsc911x driver probe 2012-04-02 16:31:22 +02:00
mach-mx31lite.c ARM: mx31lite: Fix smsc911x driver probe 2012-04-02 16:31:21 +02:00
mach-mx31moboard.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
mach-mx35_3ds.c ARM: mach-mx35_3ds: Fix build warning due to the lack of 'const' annotation 2012-04-02 11:10:24 +02:00
mach-mx50_rdp.c
mach-mx51_3ds.c
mach-mx51_babbage.c ARM: imx: add audmux pad setting for imx51-babbage 2012-05-11 17:21:19 +08:00
mach-mx51_efikamx.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
mach-mx51_efikasb.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
mach-mx53_ard.c ARM: mx53ard: Fix smsc911x driver probe 2012-04-02 16:31:21 +02:00
mach-mx53_evk.c
mach-mx53_loco.c
mach-mx53_smd.c
mach-mxt_td60.c
mach-pca100.c
mach-pcm037_eet.c
mach-pcm037.c
mach-pcm038.c
mach-pcm043.c
mach-qong.c
mach-scb9328.c
mach-vpr200.c
Makefile ARM: i.MX6: implement clocks using common clock framework 2012-05-09 08:59:34 +02:00
Makefile.boot ARM: dts: Add basic support for imx6q-sabresd 2012-05-11 15:17:52 +08:00
mm-imx1.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx3.c Merge branch 'imx/pinctrl' into imx/dt 2012-05-14 15:23:13 +02:00
mm-imx5.c Merge branch 'imx/pinctrl' into imx/dt 2012-05-14 15:23:13 +02:00
mm-imx21.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx25.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
mm-imx27.c ARM: imx: enable pinctrl dummy states 2012-05-08 23:05:16 +08:00
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
mx51_efika.c
pcm037.h
pcm970-baseboard.c
platsmp.c
pm-imx3.c ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
pm-imx5.c
pm-imx6q.c
pm-imx27.c
src.c