From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Jul 2012 02:06:25 +0000 (-0700)
Subject: Merge tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~2295
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bbeb0af25f493261c15ceee176c99b7fd6fd5479;p=firefly-linux-kernel-4.4.55.git

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

Pull MFD fix from Samuel Ortiz:
 "This one fixes an s5m8767 regulator build breakage due to a merge
  conflict caused by the MFD s5m API changes."

* tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  regulator: Fix an s5m8767 build failure
---

bbeb0af25f493261c15ceee176c99b7fd6fd5479