| commit | cd2d95d97c8d1b66467507400c63d707ddb1deba | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Apr 15 17:27:12 2013 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Apr 15 17:27:12 2013 +0100 |
| tree | 7ad5223ba88110ca6735637c9eef327515e9bb96 | |
| parent | 88dd75af0e49e1dabef6f7c7f7f4fa0234b9b988 [diff] | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa [diff] |
Merge tag 'v3.9-rc7' into regulator-fix-core Linux 3.9-rc7 Trivial context overlap conflicts: MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS index 8bdd7a7..c2d3458 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -8712,7 +8712,7 @@ F: drivers/scsi/vmw_pvscsi.h VOLTAGE AND CURRENT REGULATOR FRAMEWORK -M: Liam Girdwood <lrg@ti.com> +M: Liam Girdwood <lgirdwood@gmail.com> M: Mark Brown <broonie@kernel.org> W: http://opensource.wolfsonmicro.com/node/15 W: http://www.slimlogic.co.uk/?p=48