tmp_suning_uos_patched/arch/arm/mach-davinci
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
aemif.c
board-da830-evm.c
board-da850-evm.c
board-dm355-evm.c
board-dm355-leopard.c
board-dm365-evm.c
board-dm644x-evm.c
board-dm646x-evm.c
board-mityomapl138.c
board-neuros-osd2.c
board-omapl138-hawk.c
board-sffsdr.c
board-tnetv107x-evm.c
cdce949.c
clock.c
clock.h
common.c
cp_intc.c
cpufreq.c
cpuidle.c
da830.c
da850.c
devices-da8xx.c
devices-tnetv107x.c
devices.c
dm355.c
dm365.c
dm644x.c
dm646x.c
dma.c
gpio-tnetv107x.c
gpio.c
io.c
irq.c
Kconfig
Makefile
Makefile.boot
mux.c
mux.h
pm.c
psc.c
serial.c
sleep.S
sram.c
time.c
tnetv107x.c
usb.c