tree 2e226afc846616f901998c956290813b814b6714
parent 29bb1bdb260cd504c6ec0f567cc0cba6a4cf40e7
parent 25d6cbd840d958aada29a342c9ee370590ff7b21
author Linus Torvalds <torvalds@linux-foundation.org> 1218476683 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218476683 -0700

Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: tc6393 cleanup and update
  mfd: have TMIO drivers and subdevices depend on ARM
  mfd: TMIO MMC driver
  mfd: driver for the TMIO NAND controller
  mfd: t7l66 MMC platform data
  mfd: tc6387 MMC platform data
  mfd: Fix 7l66 and 6387 according to the new mfd-core API
  mfd: Fix tc6393 according to the new tmio.h
  mfd: driver for the TC6387XB TMIO controller.
  mfd: driver for the T7L66XB TMIO SoC
  mfd: TMIO MMC structures and accessors.