Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 02:00:15 +0000 (19:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 02:00:15 +0000 (19:00 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix for the TWL4030 PM sleep/wakeup sequence
  mfd: Fix asic3 build error
  mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset


Trivial merge