aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown2013-01-28 21:14:41 -0600
committerMark Brown2013-01-28 21:14:41 -0600
commit51b919bae5ea1a14083c54f494f68b6bee737716 (patch)
treec9d44ed4ae7c0e9b0627fc1bb4104cc8d2d0db11 /MAINTAINERS
parent1433d0905f98584abe74c219869d138304b3c9e1 (diff)
parent6b9cf5c2f286b6e86be8f1c509f6d84e675aa366 (diff)
downloadkernel-omap-51b919bae5ea1a14083c54f494f68b6bee737716.tar.gz
kernel-omap-51b919bae5ea1a14083c54f494f68b6bee737716.tar.xz
kernel-omap-51b919bae5ea1a14083c54f494f68b6bee737716.zip
Merge remote-tracking branch 'regulator/fix/lrg' into tmp
Diffstat (limited to 'MAINTAINERS')
-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/
7088F: sound/ 7088F: sound/
7089 7089
7090SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) 7090SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
7091M: Liam Girdwood <lrg@ti.com> 7091M: Liam Girdwood <lgirdwood@gmail.com>
7092M: Mark Brown <broonie@opensource.wolfsonmicro.com> 7092M: Mark Brown <broonie@opensource.wolfsonmicro.com>
7093T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 7093T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
7094L: alsa-devel@alsa-project.org (moderated for non-subscribers) 7094L: alsa-devel@alsa-project.org (moderated for non-subscribers)