diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-28 22:14:41 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-28 22:14:41 -0500 |
commit | 51b919bae5ea1a14083c54f494f68b6bee737716 (patch) | |
tree | c9d44ed4ae7c0e9b0627fc1bb4104cc8d2d0db11 /MAINTAINERS | |
parent | 1433d0905f98584abe74c219869d138304b3c9e1 (diff) | |
parent | 6b9cf5c2f286b6e86be8f1c509f6d84e675aa366 (diff) |
Merge remote-tracking branch 'regulator/fix/lrg' into tmp
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
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/ | |||
7088 | F: sound/ | 7088 | F: sound/ |
7089 | 7089 | ||
7090 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 7090 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
7091 | M: Liam Girdwood <lrg@ti.com> | 7091 | M: Liam Girdwood <lgirdwood@gmail.com> |
7092 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 7092 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
7093 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git | 7093 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git |
7094 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 7094 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |