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
..
include/plat	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
Kconfig	ARM: S5P: Add support for MFC device	2011-07-21 17:29:00 +09:00
Makefile	ARM: S5P: Add support for MFC device	2011-07-21 17:29:00 +09:00
clock.c	ARM: SAMSUNG: Move duplicate code for SPDIF ops	2011-07-21 02:10:04 +09:00
cpu.c	ARM: S5P6442: Removing ARCH_S5P6442	2011-05-12 08:10:53 +09:00
dev-csis0.c	ARM: S5P: Rename MIPI-CSIS driver header and update Copyright	2011-03-11 15:49:00 +09:00
dev-csis1.c	ARM: S5P: Rename MIPI-CSIS driver header and update Copyright	2011-03-11 15:49:00 +09:00
dev-ehci.c	ARM: EXYNOS4: Add usb host phy control	2011-04-13 16:50:44 -07:00
dev-fimc0.c	ARM: S5P: Decrease IO Registers memory region size on FIMC	2010-09-14 17:57:55 +09:00
dev-fimc1.c	ARM: S5P: Decrease IO Registers memory region size on FIMC	2010-09-14 17:57:55 +09:00
dev-fimc2.c	ARM: S5P: Decrease IO Registers memory region size on FIMC	2010-09-14 17:57:55 +09:00
dev-fimc3.c	ARM: S5P: Add platform definitions for FIMC3	2011-03-12 08:58:01 +09:00
dev-fimd0.c	ARM: EXYNOS4: Add platform device and helper functions for FIMD	2011-07-21 17:28:51 +09:00
dev-mfc.c	ARM: S5P: Add support for MFC device	2011-07-21 17:29:00 +09:00
dev-onenand.c	ARM: SAMSUNG: Remove unused onenand plat functions	2011-06-03 16:45:02 -07:00
dev-pmu.c	ARM: S5P: Add PMU device	2010-08-05 18:30:21 +09:00
dev-uart.c	ARM: S5P: Fix end address in memory resource information for UART devices	2011-02-17 12:53:36 +09:00
irq-eint.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
irq-gpioint.c	genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)	2011-07-07 16:02:26 +00:00
irq-pm.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
irq.c	ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip	2011-05-09 10:12:39 +02:00
pm.c	ARM: S5P: Remove unused s3c_pm_check_resume_pin	2011-04-14 13:19:40 +09:00
s5p-time.c	Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel	2011-07-21 17:28:23 +09:00
setup-mipiphy.c	ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control	2011-03-11 15:49:01 +09:00
sysmmu.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00