| commit | 53cb430755f7dd36e42fa02603d166a07f3d94cd | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 10 Apr 2012 17:26:41 +0000 (10 10:26 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 10 Apr 2012 17:26:41 +0000 (10 10:26 -0700) | ||
| tree | d8225505f87f64959bd496027c8556078b6d6cf3 | treesnapshot (tar.gz zip) |
| parent | 0682490d5ff6c27d4e07b62d71aeadb8bc08c2c9 | commitdiff |
| parent | c0d78c23423ee6ec774ac53f129e61839dde1908 | commitdiff |
Merge tag 'regulator-3.4' of git://git./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
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 | blobhistory |