diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-15 04:30:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-15 04:30:21 -0400 |
| commit | 5f592bb99b2634b2c515bb75d92cae14b1e22c51 (patch) | |
| tree | cb09f52b2906c50114848bee247e6e7285230045 /MAINTAINERS | |
| parent | dd4a416442a2fb4bd761163277d37ab6ce75ee4e (diff) | |
| parent | 81a4275bff16b0a63074669541be6eb4d5279f26 (diff) | |
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b642c21d2f65..1ae5a81f4436 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5286,7 +5286,7 @@ P: Liam Girdwood | |||
| 5286 | M: lrg@slimlogic.co.uk | 5286 | M: lrg@slimlogic.co.uk |
| 5287 | P: Mark Brown | 5287 | P: Mark Brown |
| 5288 | M: broonie@opensource.wolfsonmicro.com | 5288 | M: broonie@opensource.wolfsonmicro.com |
| 5289 | T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc | 5289 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git |
| 5290 | L: alsa-devel@alsa-project.org (subscribers-only) | 5290 | L: alsa-devel@alsa-project.org (subscribers-only) |
| 5291 | W: http://alsa-project.org/main/index.php/ASoC | 5291 | W: http://alsa-project.org/main/index.php/ASoC |
| 5292 | S: Supported | 5292 | S: Supported |