Merge branch 'topic/asoc' into for-linus

1 files changed, 3 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3dbf9833e47a..6e6454746540 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5854,7 +5854,7 @@ F:	include/sound/
 F:      sound/
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
-M:      Liam Girdwood <lrg@slimlogic.co.uk>
+M:      Liam Girdwood <lrg@ti.com>
 M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -6105,7 +6105,7 @@ F:	drivers/mmc/host/tifm_sd.c
 F:      include/linux/tifm.h
 
 TI TWL4030 SERIES SOC CODEC DRIVER
-M:      Peter Ujfalusi <peter.ujfalusi@nokia.com>
+M:      Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Maintained
 F:      sound/soc/codecs/twl4030*
@@ -6749,7 +6749,7 @@ F:	drivers/scsi/vmw_pvscsi.c
 F:      drivers/scsi/vmw_pvscsi.h
 
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
-M:      Liam Girdwood <lrg@slimlogic.co.uk>
+M:      Liam Girdwood <lrg@ti.com>
 M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
 W:      http://opensource.wolfsonmicro.com/node/15
 W:      http://www.slimlogic.co.uk/?p=48