linux-sg2042/arch/arm/mach-imx
David Woodhouse ffe3150125 UAPI Disintegration 2012-10-09
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUHPmWhOxKuMESys7AQLCZRAAsZAuAK0MxZ4iuq/+fmy7Uxb1jrzLOYSb
 3UgbTgXAjR0WAUHNegVZLX1Xc+12KxvMCj/8sO62Ai+wtgHeDAuUl2T0FbSZjlGK
 qqx/qQqTFHUfJRbm3Lu9iarZ2K49v1kTDk4C+nC8J9mEEW4WFlVPD10n90j+4hxr
 ZCEYril7qOQQV65oor3BT2V64+X1WDHriTLugH1o8RziRF9jh6Z2hgZAWnThcGxu
 lPsmXF2e7jDqGcM3gWtxZWu/yTBPxw549R+JUg4aVKho9WI5ClyjNAKnE7wtd3iW
 HyrylRH+ch2oeYFa5+xoyopRARUUPmujKaHU+ZI1o++eNzuw5JYiwuMlZBLyUc9I
 foWMSUw31U7695exyf66HiH7GEKI1PVpgJVNu41eJvl0iWSWCpKCB6Gs8Sw4xnp2
 auUCYSniXHNTFhFktjNdIUAn0+1X/b/SEfb/id4GvLp1K98QGOfe8dMCC8hEnXiF
 4iIViM8Sv1GB1us5huSjbMeRPbZ3x/loqEpApfgcaqcyrUR29FTE/lFQ4fj9xviL
 JjckPLMMZb4Ho5wrkCi5NtXJ16mx1qKzbBGDdqzmqaNdN+08rNF//kA9m9hCwgD8
 XfAV286DKDC0SllZIG+Uz7YLnSZjNAUhjvWN3ipV+SdT5DGybL3uSW5tYiSAzI2E
 3cayGTWINMg=
 =U9Qq
 -----END PGP SIGNATURE-----

Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c
2012-10-09 15:04:25 +01:00
..
include/mach dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c 2012-03-26 11:31:29 +05:30
Kconfig MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
Makefile ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
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.MX: remove now unnecessary argument from mxc_timer_init 2012-05-16 12:46:09 +02:00
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 ARM i.MX: remove duplicated include from clk-imx21.c 2012-08-28 08:43:32 +02:00
clk-imx25.c ARM i.MX25: Make timer irq work again 2012-09-18 16:46:50 +02:00
clk-imx27.c Linux 3.6-rc3 2012-08-24 11:25:10 -03:00
clk-imx31.c ARM: clk-imx31: Fix the keypad clock name 2012-08-03 16:28:47 +02:00
clk-imx35.c Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-09-21 23:00:41 -07:00
clk-imx51-imx53.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01: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 remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
clk-pllv2.c ARM i.MX pllv2: make round_rate accurate 2012-06-04 15:23:47 +02:00
clk-pllv3.c ARM: imx: add common clock support for pllv3 2012-05-02 12:08:06 +02:00
clk.c ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
clk.h ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
cpu-imx5.c ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
cpu-imx25.c ARM: mx25: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
cpu-imx27.c ARM: mx27: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
cpu-imx31.c ARM: mx31: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
cpu-imx35.c ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
cpu_op-mx51.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
cpu_op-mx51.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
crm-regs-imx5.h ARM i.MX53: Fix PLL4 base address 2012-06-04 15:23:57 +02:00
crmregs-imx3.h ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
devices-imx1.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx21.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx25.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx27.h [media] i.MX: coda: Add platform support for coda in i.MX27 2012-08-06 08:32:23 -03:00
devices-imx31.h arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
devices-imx35.h arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
devices-imx50.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
devices-imx51.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
ehci-imx5.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx25.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx27.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
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 ASoC: eukrea-tlv320: Convert it to platform driver 2012-09-28 14:12:52 +01:00
eukrea_mbimxsd25-baseboard.c ASoC: eukrea-tlv320: Convert it to platform driver 2012-09-28 14:12:52 +01:00
eukrea_mbimxsd35-baseboard.c ASoC: eukrea-tlv320: Convert it to platform driver 2012-09-28 14:12:52 +01:00
eukrea_mbimxsd51-baseboard.c ASoC: eukrea-tlv320: Convert it to platform driver 2012-09-28 14:12:52 +01:00
gpc.c arm/imx6q: add core drivers clock, gpc, mmdc and src 2011-10-31 14:26:23 +01:00
headsmp.S ARM: imx: build i.MX6 functions only when needed 2012-08-23 17:26:53 +02:00
hotplug.c ARM: SoC: convert imx6q to SMP operations 2012-09-14 11:15:00 +02:00
imx27-dt.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
imx31-dt.c ARM i.MX31: Add devicetree support 2012-07-10 19:23:03 +02:00
imx51-dt.c ARM: imx51: decouple device tree boot from board files 2012-09-11 16:26:59 +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
lluart.c ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
mach-apf9328.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-armadillo5x0.c ARM: imx: armadillo5x0: Fix illegal register access 2012-09-18 16:46:24 +02:00
mach-bug.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx27.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-cpuimx35.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-cpuimx51sd.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-eukrea_cpuimx25.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-imx6q.c MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
mach-imx27_visstrim_m10.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
mach-imx27ipcam.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-imx27lite.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx53.c ARM: imx53: support device tree boot only 2012-09-11 16:26:55 +08:00
mach-kzm_arm11_01.c Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-mx1ads.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-mx21ads.c Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq 2012-07-02 23:18:19 +02:00
mach-mx25_3ds.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-mx27_3ds.c ARM: mx27pdk: Add audio support 2012-08-03 15:59:29 +02:00
mach-mx27ads.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx31_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx31ads.c ARM: imx: use __iomem pointers for MMIO 2012-09-19 15:11:53 +02:00
mach-mx31lilly.c ARM: imx: eliminate macro IOMUX_TO_IRQ() 2012-07-01 21:57:06 +08:00
mach-mx31lite.c ARM: imx: use __iomem pointers for MMIO 2012-09-19 15:11:53 +02:00
mach-mx31moboard.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mach-mx35_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx50_rdp.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx51_babbage.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-mxt_td60.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
mach-pca100.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm037.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm037_eet.c ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
mach-pcm038.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm043.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-qong.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-scb9328.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-vpr200.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mm-imx1.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mm-imx3.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
mm-imx5.c ARM: imx53: remove unneeded files and functions 2012-09-11 16:26:57 +08:00
mm-imx21.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mm-imx25.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
mm-imx27.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mmdc.c arm/imx6q: add core drivers clock, gpc, mmdc and src 2011-10-31 14:26:23 +01:00
mx1-camera-fiq-ksym.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mx1-camera-fiq.S ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx31lilly-db.c dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
mx31lite-db.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mx31moboard-devboard.c arm: imx: Start using struct usb_otg 2012-02-13 13:36:03 +02:00
mx31moboard-marxbot.c arm: imx: Start using struct usb_otg 2012-02-13 13:36:03 +02:00
mx31moboard-smartbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm037.h ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
pcm970-baseboard.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
platsmp.c ARM: SoC: convert imx6q to SMP operations 2012-09-14 11:15:00 +02:00
pm-imx3.c ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
pm-imx5.c ARM: imx: Add imx5 cpuidle 2012-06-05 08:51:47 +02:00
pm-imx6q.c ARM: imx6q: resume PL310 only when CACHE_L2X0 defined 2011-12-26 10:18:59 +08:00
pm-imx27.c ARM: plat-mxc: hook special idle handlers to arm_pm_idle 2012-01-20 18:55:14 -05:00
src.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00