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
..
2008-08-07 09:55:48 +01:00
2008-08-07 09:55:48 +01:00
2008-08-07 09:55:48 +01:00
2009-12-01 01:33:51 +00:00
2009-12-01 01:33:51 +00:00
2009-12-01 01:33:51 +00:00
2009-12-01 01:33:51 +00:00
2010-10-20 00:27:33 -04:00
2011-03-31 11:26:23 -03:00
2008-08-07 09:55:48 +01:00
2008-08-07 09:55:48 +01:00
2011-07-18 10:59:26 -04:00
2010-05-18 19:06:35 +09:00
2010-05-18 19:06:34 +09:00
2010-10-20 19:40:46 +09:00
2010-10-30 00:45:28 +01:00
2011-03-20 23:14:55 +00:00
2009-05-18 16:25:40 +01:00
2008-08-07 09:55:48 +01:00
2009-03-11 18:28:24 +00:00
2011-01-06 14:09:18 +09:00
2008-08-07 09:55:48 +01:00
2011-05-10 14:16:54 -07:00
2011-02-17 23:26:55 +00:00
2008-08-07 09:55:48 +01:00
2009-12-01 01:33:50 +00:00
2008-08-07 09:55:48 +01:00
2011-07-20 23:13:20 +09:00
2010-05-10 11:44:43 +09:00
2010-05-10 11:44:03 +09:00
2011-07-18 10:59:26 -04:00
2010-05-06 11:32:14 +09:00
2010-05-10 11:44:03 +09:00
2008-08-16 20:01:18 +01:00
2011-07-18 10:59:26 -04:00
2009-12-01 01:33:51 +00:00
2009-07-30 23:22:54 +01:00
2008-08-07 09:55:48 +01:00
2010-05-10 11:44:03 +09:00
2010-05-10 11:44:03 +09:00
2011-05-10 14:16:54 -07:00
2008-08-07 09:55:48 +01:00
2008-08-07 09:55:48 +01:00
2009-12-17 08:57:01 -07:00
2009-05-17 23:30:45 +01:00
2008-09-06 12:10:45 +01:00
2008-12-15 21:46:41 +00:00
2010-02-24 01:52:12 +00:00
2010-05-06 11:37:17 +09:00
2010-10-25 16:11:44 +09:00
2008-08-07 09:55:48 +01:00
2009-12-01 01:33:51 +00:00
2008-08-07 09:55:48 +01:00