From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 May 2011 02:00:15 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
X-Git-Tag: firefly_0821_release~7613^2~1460
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5121290cad7c9e1a786952da4f6d9bfbfb87597;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* '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
---

b5121290cad7c9e1a786952da4f6d9bfbfb87597