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
Kconfig	ARM: pxa168: Add board support for gplugD	2011-07-12 19:50:37 +08:00
Makefile	ARM: pxa168: Add board support for gplugD	2011-07-12 19:50:37 +08:00
Makefile.boot	…
aspenite.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
avengers_lite.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
brownstone.c	mmc: update mmp2 mmc resources in arch/arm	2011-07-20 17:20:50 -04:00
clock.c	ARM: pxa: add clk_set_rate()	2011-07-12 19:45:19 +08:00
clock.h	ARM: pxa: add clk_set_rate()	2011-07-12 19:45:19 +08:00
common.c	ARM: mmp: update cpuid of pxa168 and pxa910	2010-10-09 17:07:32 +08:00
common.h	[ARM] mmp: move declarations into SoC specific header file from common.h	2010-08-05 14:34:46 +08:00
devices.c	…
flint.c	ARM: mmp: correct the naming of GPIOxx_GPIO definitions	2010-12-20 23:07:47 +08:00
gplugd.c	ARM: pxa168: Add board support for gplugD	2011-07-12 19:50:37 +08:00
irq-mmp2.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
irq-pxa168.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
jasper.c	mmc: update mmp2 mmc resources in arch/arm	2011-07-20 17:20:50 -04:00
mmp2.c	mmc: update mmp2 mmc resources in arch/arm	2011-07-20 17:20:50 -04:00
pxa168.c	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
pxa910.c	ARM: pxa910: correct nand pmu setting	2011-07-06 23:51:22 +08:00
tavorevb.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
teton_bga.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
time.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ttc_dkb.c	ARM: mmp/dkb: enable max7312 gpio expander	2011-07-12 19:50:38 +08:00