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	ARM: S5P64X0: External Interrupt Support	2011-07-21 17:29:29 +09:00
Kconfig	ARM: S5P64X0: Add PWM backlight support on SMDK6450	2011-07-21 02:10:46 +09:00
Makefile	ARM: S5P64X0: External Interrupt Support	2011-07-21 17:29:29 +09:00
Makefile.boot	ARM: S5P64X0: Update Kconfig and Makefile	2010-10-18 10:33:34 +09:00
clock-s5p6440.c	ARM: S5P64X0: Add clkdev support	2011-07-20 19:11:30 +09:00
clock-s5p6450.c	ARM: S5P64X0: Add clkdev support	2011-07-20 19:11:30 +09:00
clock.c	ARM: S5P: Reduce duplicated EPLL control codes	2010-10-25 16:05:56 +09:00
cpu.c	ARM: S5P64X0: Fix iodesc array size for S5P6450	2011-03-28 16:17:53 +09:00
dev-audio.c	ARM: S5P64X0: Segregate audio devices	2010-12-30 08:24:27 +09:00
dev-spi.c	ARM: SAMSUNG: Add tx_st_done variable	2011-07-06 15:03:08 +09:00
dma.c	ARM: S5P: Reorder DMA platform device id	2010-10-25 16:10:47 +09:00
gpiolib.c	ARM: S5P64X0: Change GPIOlib initialization to core_initcall	2010-12-30 09:37:28 +09:00
init.c	ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support	2010-10-18 18:29:51 +09:00
irq-eint.c	ARM: S5P64X0: External Interrupt Support	2011-07-21 17:29:29 +09:00
mach-smdk6440.c	ARM: S5P64X0: Add PWM backlight support on SMDK6440	2011-07-21 02:10:40 +09:00
mach-smdk6450.c	ARM: S5P64X0: Add PWM backlight support on SMDK6450	2011-07-21 02:10:46 +09:00
setup-i2c0.c	ARM: S5P64X0: Change to using s3c_gpio_cfgall_range()	2010-10-23 11:50:20 +09:00
setup-i2c1.c	ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgall_range()	2010-10-23 11:50:53 +09:00