From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Apr 2012 19:42:12 +0000 (-0700)
Subject: Merge tag 'mfd-for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: v3.4-rc4~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f24ff6f4236f117729bdb2fe8b0c202ce86098f;p=profile%2Fcommon%2Fkernel-common.git

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

Pull MFD fixes from Samuel Ortiz:
 "We have 3 build fixes, a OMAP USB host PHY reset fix and the twl6040
  conversion to an i2c driver.  The latter may not sound like a fix but
  the twl6040 MFD driver won't probe without it, triggering an OMAP4
  audio regression."

* tag 'mfd-for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix modular builds of rc5t583 regulator support
  mfd: Fix asic3_gpio_to_irq
  ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue
  mfd: Convert twl6040 to i2c driver, and separate it from twl core
  mfd : Fix dbx500 compilation error
---

9f24ff6f4236f117729bdb2fe8b0c202ce86098f