Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 15:42:21 +0000 (08:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 15:42:21 +0000 (08:42 -0700)
commit022d5bcd49e0b3c3a3fde60491837414f96cc20e
treed582182f83dfa42a51fb169cec3c9fe2afd618cc
parent95237b80a3021ce5abb4d9ad330355549026f9c3
parent6cac6e8489af6c419cb6af6911535a280e6b6c2e
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