]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: Fix asic3 compilation
  mfd: Fix Kconfig accroding to the new gpiolib symbols


Trivial merge