summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-29 11:14:41 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-29 11:14:41 +0800
commit51b919bae5ea1a14083c54f494f68b6bee737716 (patch)
treec9d44ed4ae7c0e9b0627fc1bb4104cc8d2d0db11
parent1433d0905f98584abe74c219869d138304b3c9e1 (diff)
parent6b9cf5c2f286b6e86be8f1c509f6d84e675aa366 (diff)
Merge remote-tracking branch 'regulator/fix/lrg' into tmp
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8ae709e34523..ff60aac83dca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7088,7 +7088,7 @@ F: include/uapi/sound/
F: sound/
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
-M: Liam Girdwood <lrg@ti.com>
+M: Liam Girdwood <lgirdwood@gmail.com>
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
L: alsa-devel@alsa-project.org (moderated for non-subscribers)