Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jul 2012 20:43:02 +0000 (13:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jul 2012 20:43:02 +0000 (13:43 -0700)
commit2437fccfbfc83bcb868ccc7fdfe2b5310bf07835
tree53404340e5db6fd2e524806a3b898cdd7fe39a17
parent6c6ee53c55dd0d3d9c3b42d4770bb82842d99727
parentd92d95b6bf2722ffa0fefa7651c51bf336743dd7
Merge tag 'regulator-3.5' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "A smallish fix for a lock dependency issue which affects a bunch of
  Qualcomm boards that do unusually complicated things with their
  regulators, the API is unlikely to be called by any other system."

* tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix recursive mutex lockdep warning