diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:37:41 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:37:41 -0500 |
| commit | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (patch) | |
| tree | 3f5d8f9f6e5edd991dbc6b51685dd726543e755a /MAINTAINERS | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
| parent | 19940b3d55c87d8089a8cb0fa8e5a9918a3846bd (diff) | |
Merge branch 'for-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.2
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4808256446f2..c802e5fa2d11 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6122,7 +6122,7 @@ F: sound/ | |||
| 6122 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 6122 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
| 6123 | M: Liam Girdwood <lrg@ti.com> | 6123 | M: Liam Girdwood <lrg@ti.com> |
| 6124 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 6124 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| 6125 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git | 6125 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git |
| 6126 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 6126 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| 6127 | W: http://alsa-project.org/main/index.php/ASoC | 6127 | W: http://alsa-project.org/main/index.php/ASoC |
| 6128 | S: Supported | 6128 | S: Supported |