original_kernel/arch/arm/plat-samsung
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
include/plat Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
Kconfig ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
Makefile ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
adc.c
clock-clksrc.c
clock.c
dev-adc.c
dev-asocdma.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 ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
dev-rtc.c
dev-ts.c ARM: SAMSUNG: Drop exporting s3c24xx_ts_set_platdata 2011-02-18 17:36:32 +09:00
dev-uart.c ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices 2011-03-04 15:46:26 +09:00
dev-usb-hsotg.c
dev-usb.c
dev-wdt.c
dma.c
gpio-config.c
gpio.c
gpiolib.c
init.c
irq-uart.c
irq-vic-timer.c
pd.c
platformdata.c
pm-check.c
pm-gpio.c
pm.c ARM: pm: convert samsung platforms to generic suspend/resume support 2011-02-22 17:11:25 +00:00
pwm-clock.c
pwm.c ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
s3c-pl330.c
time.c
wakeup-mask.c