kernel-fxtec-pro1x/arch/arm/mach-ux500
Linus Torvalds 21ebd6c68b Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
  rtc: max8925: Add function to work as wakeup source
  mfd: Add pm ops to max8925
  mfd: Convert aat2870 to dev_pm_ops
  mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
  mfd: Introduce missing kfree in 88pm860x probe routine
  mfd: Add S5M series configuration
  mfd: Add s5m series irq driver
  mfd: Add S5M core driver
  mfd: Improve mc13xxx dt binding document
  mfd: Fix stmpe section mismatch
  mfd: Fix stmpe build warning
  mfd: Fix STMPE I2c build failure
  mfd: Constify aat2870-core i2c_device_id table
  gpio: Add support for stmpe variant 801
  mfd: Add support for stmpe variant 801
  mfd: Add support for stmpe variant 610
  mfd: Add support for STMPE SPI interface
  mfd: Separate out STMPE controller and interface specific code
  misc: Remove max8997-muic sysfs attributes
  mfd: Remove unused wm831x_irq_data_to_mask_reg()
  ...

Fix up trivial conflict in drivers/leds/Kconfig due to addition of
LEDS_MAX8997 and LEDS_TCA6507 next to each other.
2012-01-13 20:43:32 -08:00
..
include/mach Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08:00
board-mop500-pins.c
board-mop500-regulators.c
board-mop500-regulators.h
board-mop500-sdi.c
board-mop500-stuib.c
board-mop500-u8500uib.c
board-mop500-uib.c
board-mop500.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08:00
board-mop500.h
board-u5500-sdi.c
board-u5500.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08:00
cache-l2x0.c
clock.c ARM: ux500: fix the smp_twd clock calculation 2011-12-19 00:35:08 +01:00
clock.h
cpu-db5500.c New feature development 2012-01-09 14:38:51 -08:00
cpu-db8500.c New feature development 2012-01-09 14:38:51 -08:00
cpu.c
devices-common.c
devices-common.h
devices-db5500.h
devices-db8500.c
devices-db8500.h
devices.c
dma-db5500.c
headsmp.S
hotplug.c
id.c
Kconfig
localtimer.c
Makefile
Makefile.boot
mbox-db5500.c
modem-irq-db5500.c
pins-db5500.h
pins-db8500.h
platsmp.c
ste-dma40-db5500.h
ste-dma40-db8500.h
timer.c
usb.c