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/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
bast-ide.c
bast-irq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
cpu-freq.c
dma.c
gpio.c
h1940-bluetooth.c	treewide: remove duplicate includes	2011-06-20 16:08:19 +02:00
Kconfig
mach-amlm5900.c	mtd: s3c2410: remove CONFIG_MTD_PARTITIONS test	2011-05-25 02:20:52 +01:00
mach-bast.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
mach-h1940.c	ARM: H1940/RX1950: Change default LED triggers	2011-03-21 23:29:43 +00:00
mach-n30.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
mach-otom.c
mach-qt2410.c	mach-qt2410: convert to spi_gpio	2011-07-04 10:52:49 -06:00
mach-smdk2410.c
mach-tct_hammer.c	mtd: s3c2410: remove CONFIG_MTD_PARTITIONS test	2011-05-25 02:20:52 +01:00
mach-vr1000.c
Makefile	ARM: S3C2410: remove the now empty mach-s3c2410/irq.c	2011-06-03 18:36:53 -07:00
Makefile.boot
nor-simtec.c	ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info	2011-05-20 22:27:34 +01:00
nor-simtec.h
pll.c
pm-h1940.S
pm.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
s3c2410.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
sleep.S
usb-simtec.c
usb-simtec.h