]> 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)
commit643a47ddf2978d38569e847ad5aca72fabc2e81a
treed8225505f87f64959bd496027c8556078b6d6cf3
parente615ea89a4a326245b2ec3b9a208745f815ceff1
parentf6979ccf85f7f509ea75b7309fde694e919f1504
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