Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 May 2012 18:49:30 +0000 (11:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 May 2012 18:49:30 +0000 (11:49 -0700)
commit1eef1600af5f7404505f217513946e04c6b95718
tree77d48fa50536643242c09b244f89add9a940cc39
parent789505b05752239d957dbfa84b183e0d7a641952
parent968c2c1707a3396ccd6e7e6c5ddaf658a6d3bd66
Merge tag 'regulator-3.4' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "One small fix for an edge condition in the max8997 driver and a fix
  for a surprise in the devres API which caused devm_regulator_put() to
  not actually put the regulator - a nicer version of this based on an
  improvement of the devres API is queued for 3.5."

* tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Actually free the regulator in devm_regulator_put()
  regulator: Fix the logic to ensure new voltage setting in valid range