Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 00:27:24 +0000 (16:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 00:27:24 +0000 (16:27 -0800)
commitb743791639d8142277df1c2814c282e3ad752f06
tree27e09f48e6c28b8695c343dbd3d8dedb0a92b3a4
parent9219a3b9889dbc7dae68e472f239672ff48860b0
parentb29c06ae96acc47e866f29d19075707f91df69c8
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

* 'for-next' of git://git.o-hand.com/linux-mfd:
  mfd: Fix twl4030-core build
  mfd: Ensure sm501 GPIO pin mode is GPIO when configured
  mfd: dm355 evm MMC/SD card detection
  regulator: PCF50633 pmic driver
  input: PCF50633 input driver
  power_supply: PCF50633 battery charger driver
  rtc: PCF50633 rtc driver
  mfd: PCF50633 gpio support
  mfd: PCF50633 adc driver
  mfd: PCF50633 core driver