]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Apr 2012 17:26:41 +0000 (10:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Apr 2012 17:26:41 +0000 (10:26 -0700)
commit9e52eb7715eec813fdd6efa382a2441ad0e5562d
treed8225505f87f64959bd496027c8556078b6d6cf3
parent97d59a6c8dd1d9eae8d5f4873c432da7d2cbc7c2
parent87fce3574d04193b411edacde0c2e1ddadf7dcf5
Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull a regulator build fix from Mark Brown:
 "Fix a build warning in the anatop driver for 3.4

  This is a trivial rename to stop the build system complaining that
  we're referencing things we shouldn't be."

* tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: anatop: fix 'anatop_regulator' name collision
drivers/regulator/anatop-regulator.c