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/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-25 11:53:35 -07:00
include/mach	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
clock-mx23.c
clock-mx28.c
clock.c
devices-mx23.h
devices-mx28.h
devices.c	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
icoll.c
iomux.c
Kconfig	arm: mxs: add mmc-device for mach-tx28	2011-07-07 10:01:14 +02:00
mach-mx23evk.c
mach-mx28evk.c	ARM: mxs/mx28evk: add leds-gpio device for heartbeat	2011-07-07 10:01:07 +02:00
mach-stmp378x_devb.c
mach-tx28.c	arm: mxs: add mmc-device for mach-tx28	2011-07-07 10:01:14 +02:00
Makefile	gpio/mxs: Move Freescale mxs gpio driver to drivers/gpio	2011-06-06 09:37:58 -06:00
Makefile.boot
mm-mx23.c	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
mm-mx28.c	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
module-tx28.c
module-tx28.h
ocotp.c	arm: mxs: include asm/processor.h for cpu_relax()	2011-06-06 09:50:04 +02:00
pm.c
regs-clkctrl-mx23.h
regs-clkctrl-mx28.h
system.c
timer.c