tmp_suning_uos_patched/drivers/mfd
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
..
88pm860x-core.c
88pm860x-i2c.c
ab3100-core.c
ab3100-otp.c
ab3550-core.c
ab8500-core.c
ab8500-debugfs.c
ab8500-i2c.c
abx500-core.c
adp5520.c
asic3.c
cs5535-mfd.c
da903x.c
davinci_voicecodec.c
dm355evm_msp.c
ezx-pcap.c
htc-egpio.c
htc-i2cpld.c
htc-pasic3.c
janz-cmodio.c
jz4740-adc.c
Kconfig
lpc_sch.c
Makefile
max8925-core.c
max8925-i2c.c
max8998-irq.c
max8998.c
mc13xxx-core.c
mcp-core.c
mcp-sa11x0.c
menelaus.c
mfd-core.c
omap-usb-host.c
pcf50633-adc.c
pcf50633-core.c
pcf50633-gpio.c
pcf50633-irq.c
rdc321x-southbridge.c
sh_mobile_sdhi.c
sm501.c
stmpe.c
stmpe.h
t7l66xb.c
tc3589x.c
tc6387xb.c
tc6393xb.c
ti-ssp.c
timberdale.c
timberdale.h
tmio_core.c
tps6507x.c
tps6586x.c
tps65010.c
twl-core.c
twl-core.h
twl4030-codec.c
twl4030-irq.c
twl4030-power.c
twl6030-irq.c
twl6030-pwm.c
ucb1x00-assabet.c
ucb1x00-core.c
ucb1x00-ts.c
ucb1400_core.c
vx855.c
wl1273-core.c
wm831x-core.c
wm831x-i2c.c
wm831x-irq.c
wm831x-otp.c
wm831x-spi.c
wm8350-core.c
wm8350-gpio.c
wm8350-i2c.c
wm8350-irq.c
wm8350-regmap.c
wm8400-core.c
wm8994-core.c
wm8994-irq.c