0355549026f9c3
parent 6cac6e8489af6c419cb6af6911535a280e6b6c2e
author Linus Torvalds <torvalds@linux-foundation.org> 1222789341 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222789341 -0700

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

* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: Fix asic3 compilation
  mfd: Fix Kconfig accroding to the new gpiolib symbols