q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/plat-samsung
History
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/plat 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
adc.c ARM: SAMSUNG: Revise PM for 12-bit ADC operations 2011-07-20 23:39:12 +09:00
clock-clksrc.c
clock.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
dev-adc.c
dev-asocdma.c ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
dev-backlight.c ARM: SAMSUNG: Create a common infrastructure for PWM backlight support 2011-07-21 02:10:16 +09:00
dev-fb.c ARM: SAMSUNG: Use generic s3c_set_platdata for FB 2011-07-21 02:11:01 +09:00
dev-hsmmc.c
dev-hsmmc1.c
dev-hsmmc2.c
dev-hsmmc3.c
dev-hwmon.c ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON 2011-07-21 02:11:06 +09:00
dev-i2c0.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c1.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c2.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c3.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c4.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c5.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c6.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c7.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-ide.c
dev-keypad.c
dev-nand.c ARM: SAMSUNG: Use generic s3c_set_platdata for NAND 2011-07-21 02:11:16 +09:00
dev-onenand.c
dev-pwm.c
dev-rtc.c
dev-ts.c ARM: SAMSUNG: Use generic s3c_set_platdata for TS 2011-07-21 02:10:56 +09:00
dev-uart.c
dev-usb-hsotg.c
dev-usb.c ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI 2011-07-21 02:11:11 +09:00
dev-wdt.c
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
gpio-config.c
gpio.c
init.c
irq-uart.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
irq-vic-timer.c ARM: SAMSUNG: Check NULL return from irq_alloc_generic_chip 2011-07-16 11:13:47 +09:00
Kconfig ARM: SAMSUNG: Create a common infrastructure for PWM backlight support 2011-07-21 02:10:16 +09:00
Makefile ARM: SAMSUNG: Create a common infrastructure for PWM backlight support 2011-07-21 02:10:16 +09:00
pd.c
platformdata.c
pm-check.c
pm-gpio.c
pm.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
pwm-clock.c ARM: S3C24XX: Add clkdev support 2011-07-20 19:11:29 +09:00
pwm.c
s3c-pl330.c
time.c ARM: S3C24XX: Add clkdev support 2011-07-20 19:11:29 +09:00
wakeup-mask.c