From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 May 2012 18:49:30 +0000 (-0700)
Subject: Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: firefly_0821_release~3680^2~2932
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1eef1600af5f7404505f217513946e04c6b95718;p=firefly-linux-kernel-4.4.55.git

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
---

1eef1600af5f7404505f217513946e04c6b95718