Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 23:37:37 +0000 (16:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 23:37:37 +0000 (16:37 -0700)
commita483ab1dddf86a0e8924e94cf838eed602602b39
tree3cfd2da7cfec32f5c1bc54dfb1d491bfa07d444f
parenteba966a4e780199e31e8fd1d21bc9d187b1c9eaf
parent9c366452e0b2df06f3ce0aabc6a53c94c595cd00
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: Make WM8400 depend on I2C until SPI is submitted
  mfd: add missing Kconfig entry for da903x