From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 May 2012 00:21:05 +0000 (-0700)
Subject: Merge tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311;p=~shefty%2Frdma-dev.git

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

Pull second set of MFD fixes from Samuel Ortiz:
 "This time we only have a one liner fixing an omap-usb build error."

* tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix build breakage in omap-usb-host.c
---

0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311