diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-22 03:26:24 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-22 03:26:24 -0500 |
| commit | e51ff2b64baf9d546a7a7641cdd8ec6b17568689 (patch) | |
| tree | 0c71b4e494117ccb67dd666a8194c57b282af848 | |
| parent | 32eca984f6815f25c8ee2f5521758f5625579223 (diff) | |
| parent | 427ca6df7318343354b30e7017701821fbf86499 (diff) | |
Merge remote-tracking branch 'asoc/fix/lrg' into tmp
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3105c4868c4e..7281a7b9224b 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) |