diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-10 19:26:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-10 19:26:41 +0200 |
commit | 53cb430755f7dd36e42fa02603d166a07f3d94cd (patch) | |
tree | d8225505f87f64959bd496027c8556078b6d6cf3 /drivers/sh | |
parent | Merge branch 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
parent | regulator: anatop: fix 'anatop_regulator' name collision (diff) | |
download | linux-53cb430755f7dd36e42fa02603d166a07f3d94cd.tar.xz linux-53cb430755f7dd36e42fa02603d166a07f3d94cd.zip |
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
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions