69f1d1a6ac
* '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 |
||
|---|---|---|
| .. | ||
| include/plat | ||
| Kconfig | ||
| Makefile | ||
| adc.c | ||
| clock-clksrc.c | ||
| clock.c | ||
| dev-adc.c | ||
| dev-asocdma.c | ||
| dev-backlight.c | ||
| dev-fb.c | ||
| dev-hsmmc.c | ||
| dev-hsmmc1.c | ||
| dev-hsmmc2.c | ||
| dev-hsmmc3.c | ||
| dev-hwmon.c | ||
| dev-i2c0.c | ||
| dev-i2c1.c | ||
| dev-i2c2.c | ||
| dev-i2c3.c | ||
| dev-i2c4.c | ||
| dev-i2c5.c | ||
| dev-i2c6.c | ||
| dev-i2c7.c | ||
| dev-ide.c | ||
| dev-keypad.c | ||
| dev-nand.c | ||
| dev-onenand.c | ||
| dev-pwm.c | ||
| dev-rtc.c | ||
| dev-ts.c | ||
| dev-uart.c | ||
| dev-usb-hsotg.c | ||
| dev-usb.c | ||
| dev-wdt.c | ||
| dma.c | ||
| gpio-config.c | ||
| gpio.c | ||
| init.c | ||
| irq-uart.c | ||
| irq-vic-timer.c | ||
| pd.c | ||
| platformdata.c | ||
| pm-check.c | ||
| pm-gpio.c | ||
| pm.c | ||
| pwm-clock.c | ||
| pwm.c | ||
| s3c-pl330.c | ||
| time.c | ||
| wakeup-mask.c | ||