linux/arch/arm/mach-exynos4
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/mach Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
Kconfig ARM: EXYNOS4: Add keypad device to the SMDKV310 2011-03-15 20:37:02 +09:00
Makefile ARM: EXYNOS4: Add keypad device helpers 2011-03-15 20:37:02 +09:00
Makefile.boot ARM: EXYNOS4: Update Kconfig and Makefile for the new ARCH_EXYNOS4 2011-02-22 13:51:15 +09:00
clock.c ARM: EXYNOS4: Implement Clock gating for System MMU 2011-03-15 21:37:38 +09:00
cpu.c ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
cpufreq.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
dev-ahci.c ARM: EXYNOS4: Add support for SATA on ARMLEX4210 2011-03-15 18:35:30 +09:00
dev-audio.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
dev-pd.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
dev-sysmmu.c ARM: EXYNOS4: Implement Clock gating for System MMU 2011-03-15 21:37:38 +09:00
dma.c
gpiolib.c ARM: EXYNOS4: Add support for gpio interrupts 2011-03-15 21:17:43 +09:00
headsmp.S
hotplug.c ARM: EXYNOS4: Fix wrong constants in the hotplug assembly code. 2011-02-28 20:35:33 +09:00
init.c
irq-combiner.c ARM: EXYNOS4: Update IRQ part 2011-02-22 13:51:15 +09:00
irq-eint.c ARM: EXYNOS4: Update IRQ part 2011-02-22 13:51:15 +09:00
localtimer.c ARM: EXYNOS4: Update Timer part 2011-02-22 13:51:15 +09:00
mach-armlex4210.c ARM: EXYNOS4: Add support for SATA on ARMLEX4210 2011-03-15 18:35:30 +09:00
mach-nuri.c ARM: EXYNOS4: enabled lcd and backlight in NURI board 2011-03-08 07:17:09 +09:00
mach-smdkc210.c ARM: EXYNOS4: Moved board support files 2011-02-22 13:51:15 +09:00
mach-smdkv310.c ARM: EXYNOS4: Add keypad device to the SMDKV310 2011-03-15 20:37:02 +09:00
mach-universal_c210.c ARM: EXYNOS4: Add support for i2c PMICs on Universal_C210 board 2011-03-04 15:20:31 +09:00
mct.c ARM: EXYNOS4: Implement kernel timers using MCT 2011-03-11 10:40:37 +09:00
platsmp.c
pm.c ARM: EXYNOS4: Suspend to RAM Support 2011-03-12 10:18:24 +09:00
setup-fimc.c ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
setup-i2c0.c
setup-i2c1.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c2.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c3.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c4.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c5.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c6.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c7.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-keypad.c ARM: EXYNOS4: Add keypad device helpers 2011-03-15 20:37:02 +09:00
setup-sdhci-gpio.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-sdhci.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
sleep.S ARM: EXYNOS4: Suspend to RAM Support 2011-03-12 10:18:24 +09:00
time.c ARM: EXYNOS4: Update HRT for supporting PM 2011-03-12 10:18:34 +09:00