Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits) ARM: S5P64X0: External Interrupt Support ARM: EXYNOS4: Enable MFC on Samsung NURI ARM: EXYNOS4: Enable MFC on universal_c210 ARM: S5PV210: Enable MFC on Goni ARM: S5P: Add support for MFC device ARM: EXYNOS4: Add support FIMD on SMDKC210 ARM: EXYNOS4: Add platform device and helper functions for FIMD ARM: EXYNOS4: Add resource definition for FIMD ARM: EXYNOS4: Change devname for FIMD clkdev ARM: SAMSUNG: Add IRQ_I2S0 definition ARM: SAMSUNG: Add platform device for idma ARM: EXYNOS4: Add more registers to be saved and restored for PM ARM: EXYNOS4: Add more register addresses of CMU ARM: EXYNOS4: Add platform device for dwmci driver ARM: EXYNOS4: configure rtc-s3c on NURI ARM: EXYNOS4: configure MAX8903 secondary charger on NURI ARM: EXYNOS4: configure ADC on NURI ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs ... Fix up tons of silly conflicts: - arch/arm/mach-davinci/include/mach/psc.h - arch/arm/mach-exynos4/Kconfig - arch/arm/mach-exynos4/mach-smdkc210.c - arch/arm/mach-exynos4/pm.c - arch/arm/mach-imx/mm-imx1.c - arch/arm/mach-imx/mm-imx21.c - arch/arm/mach-imx/mm-imx25.c - arch/arm/mach-imx/mm-imx27.c - arch/arm/mach-imx/mm-imx31.c - arch/arm/mach-imx/mm-imx35.c - arch/arm/mach-mx5/mm.c - arch/arm/mach-s5pv210/mach-goni.c - arch/arm/mm/Kconfig		2011-07-26 17:41:04 -07:00
..
devices	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
include/mach	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
3ds_debugboard.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
audmux-v1.c
audmux-v2.c	ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC	2010-11-19 21:54:34 +01:00
avic.c	ARM i.MX avic: do not depend on MXC_INTERNAL_IRQS	2011-07-07 10:00:00 +02:00
clock.c	arm: mxc: utilise usecount field in clock operations	2010-07-26 14:17:57 +02:00
cpu.c
cpufreq.c	treewide: cleanup continuations and remove logging message whitespace	2011-04-26 10:24:37 +02:00
devices.c	ARM: mxc: clean up imx-dma device registration	2011-07-07 10:01:12 +02:00
epit.c	clocksource: convert ARM 32-bit down counting clocksources	2011-05-23 18:04:51 +01:00
iomux-v1.c	ARM: mxc: iomux-v1: Fix build warning	2011-07-07 09:07:33 +02:00
iomux-v3.c	MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)	2010-12-15 12:42:49 +01:00
iram_alloc.c	ARM: imx: Add iram allocator functions	2010-10-19 18:44:57 +02:00
irq-common.c	ARM: mxc: convert tzic to use generic irq chip	2011-07-07 10:01:07 +02:00
irq-common.h	mx51: support FIQ on TZIC, revised	2010-12-14 09:54:37 +01:00
Kconfig	ARM: imx: move mx3 support to mach-imx	2011-05-19 13:11:38 +02:00
Makefile	gpio/mxc: Move Freescale MXC gpio driver to drivers/gpio	2011-06-06 10:01:19 -06:00
pwm.c	plat-mxc/pwm.c: use resource_size()	2011-07-07 10:00:01 +02:00
ssi-fiq-ksym.c
ssi-fiq.S	ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL	2011-04-12 09:48:10 +02:00
system.c	ARM: remove support for mxc91231	2011-05-19 13:11:28 +02:00
time.c	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
tzic.c	ARM: mxc: convert tzic to use generic irq chip	2011-07-07 10:01:07 +02:00
ulpi.c	ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers	2011-03-07 19:29:41 +01:00