]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0682490 c0d78c2)
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)
commit53cb430755f7dd36e42fa02603d166a07f3d94cd
treed8225505f87f64959bd496027c8556078b6d6cf3tree | snapshot
parent0682490d5ff6c27d4e07b62d71aeadb8bc08c2c9commit | diff
parentc0d78c23423ee6ec774ac53f129e61839dde1908commit | diff
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 diff1 | diff2 | blob | history
Michael's Linux tree.