summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-28 22:44:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-28 22:44:53 -0800
commit6abb7c25775b7fb2225ad0508236d63ca710e65f (patch)
treeae0f46f7e186d99f17aba6f2805dafdc481e8bed /MAINTAINERS
parentfc16e884a2320198b8cb7bc2fdcf6b4485e79709 (diff)
parent51b919bae5ea1a14083c54f494f68b6bee737716 (diff)
downloadlinux-6abb7c25775b7fb2225ad0508236d63ca710e65f.tar.bz2
Merge tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "Fairly small stuff - a build failure fix for ST platforms, an error checking fix and an update to the MAINTAINERS file for Liam." * tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: tps80031: Use IS_ERR to check return value of regulator_register() regulators: db8500: Fix compile failure for drivers/regulator/dbx500-prcmu.c regulator: MAINTAINERS: update email address
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 76ae4aa15129..212c255b9347 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)