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
..
adc-core.h	ARM: SAMSUNG: Implement set_name function for ADC devices	2010-08-05 18:32:50 +09:00
adc.h	Update broken web addresses in arch directory.	2010-10-18 11:03:21 +02:00
ata-core.h	ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs	2010-08-05 18:32:50 +09:00
ata.h	ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs	2010-08-05 18:32:50 +09:00
audio.h	ARM: SAMSUNG: Add platform device for idma	2011-07-21 14:12:19 +09:00
backlight.h	ARM: SAMSUNG: Create a common infrastructure for PWM backlight support	2011-07-21 02:10:16 +09:00
clock-clksrc.h
clock.h	ARM: SAMSUNG: Add clkdev infrastructure	2011-07-20 19:11:28 +09:00
cpu-freq.h
cpu.h	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable	2011-05-25 21:47:48 +01:00
debug-macro.S	ARM: S5P6442: Removing ARCH_S5P6442	2011-05-12 08:10:53 +09:00
devs.h	ARM: S5P: Add support for MFC device	2011-07-21 17:29:00 +09:00
dma-core.h
dma-s3c24xx.h
dma.h	ARM: SAMSUNG: DMA Cleanup as per sparse	2011-07-16 15:50:19 +09:00
fb-core.h	ARM: EXYNOS4: Add platform device and helper functions for FIMD	2011-07-21 17:28:51 +09:00
fb.h	ARM: EXYNOS4: Add platform device and helper functions for FIMD	2011-07-21 17:28:51 +09:00
fimc-core.h	ARM: S5P: Add platform definitions for FIMC3	2011-03-12 08:58:01 +09:00
gpio-cfg-helpers.h	ARM: mach-s3c24a0: delete	2011-07-18 10:58:18 -04:00
gpio-cfg.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
gpio-core.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
hwmon.h	ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung	2010-05-12 17:43:03 +09:00
iic-core.h	ARM: S5PV210: add common I2C device helpers	2010-05-20 18:21:34 +09:00
iic.h	ARM: SAMSUNG: Cleanup I2C code in plat-samsung	2011-07-21 02:09:59 +09:00
irq-uart.h
irq-vic-timer.h	ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip	2011-05-09 10:12:39 +02:00
keypad-core.h	ARM: S5PV210: Add keypad device helpers	2010-08-05 18:31:01 +09:00
keypad.h	ARM: SAMSUNG: Add keypad device support	2010-08-06 21:27:50 +09:00
map-base.h	ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space	2010-10-25 16:11:38 +09:00
nand-core.h	ARM: SAMSUNG: Add setname core function for S3C24XX NAND	2010-10-18 19:56:45 +09:00
nand.h
onenand-core.h	ARM: SAMSUNG: Add platform support code for OneNAND controller	2010-05-20 17:48:36 +09:00
pd.h	ARM: EXYNOS4: Update device support	2011-02-22 13:51:15 +09:00
pll6553x.h	ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use	2010-05-10 11:44:37 +09:00
pm.h	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
regs-ac97.h
regs-adc.h	ARM: SAMSUNG: ADC Channel selection	2011-07-20 23:39:04 +09:00
regs-ata.h	ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs	2010-08-05 18:32:50 +09:00
regs-fb-v4.h	s3c-fb: integrate palette setup code into main driver	2010-08-11 08:59:10 -07:00
regs-fb.h	s3c-fb: add support for DMA channel control on S5PV210	2010-08-11 08:59:12 -07:00
regs-iic.h
regs-irqtype.h
regs-nand.h
regs-onenand.h	ARM: SAMSUNG: Add platform support code for OneNAND controller	2010-05-20 17:48:36 +09:00
regs-rtc.h	ARM: SAMSUNG: Updates RTC register for support Alarm IRQ and Time Tick.	2010-08-05 18:32:51 +09:00
regs-sdhci.h
regs-serial.h	ARM: mach-s3c24a0: delete	2011-07-18 10:58:18 -04:00
regs-timer.h
regs-usb-hsotg-phy.h
regs-usb-hsotg.h	USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode	2010-08-10 14:35:42 -07:00
regs-watchdog.h
s3c64xx-spi.h	ARM: SAMSUNG: Add tx_st_done variable	2011-07-06 15:03:08 +09:00
s3c-dma-pl330.h	ARM: S5P64X0: Move DMA support for S5P64X0	2010-10-18 18:33:03 +09:00
s3c-pl330-pdata.h	S3C: DMA: Add api driver for PL330	2010-05-18 18:00:12 +09:00
sdhci.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
ts.h	ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen	2010-05-19 18:25:22 +09:00
udc-hs.h
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00
usb-control.h
wakeup-mask.h	ARM: SAMSUNG: Add support for interrupt wakeup-sources	2010-05-20 21:07:01 +09:00
watchdog-reset.h