Merge remote-tracking branch 'regulator/fix/lrg' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Jan 2013 03:14:41 +0000 (11:14 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Jan 2013 03:14:41 +0000 (11:14 +0800)
MAINTAINERS

index 8ae709e..ff60aac 100644 (file)
@@ -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)