summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:33 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:33 +0100
commit78da02186a5a7cd813321ef018a1c6dbaf888722 (patch)
treef580c6d9c70389c7cc9cb5d659294e5077b0e412
parent78040b630f28298e0ecb56bf1bc53c7976314eab (diff)
parentcd2d95d97c8d1b66467507400c63d707ddb1deba (diff)
Merge remote-tracking branch 'regulator/fix/core' into v3.9-rc8
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8bdd7a7ef2f..c2d34589683 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8712,7 +8712,7 @@ F: drivers/scsi/vmw_pvscsi.c
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