diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-19 05:40:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-19 05:40:02 -0400 |
| commit | d6aa764ee8674512287913fcc3a0b1b5c050d5eb (patch) | |
| tree | 0cb4a8f6d6cd6f649e705dce6390fa99afc859e0 /MAINTAINERS | |
| parent | 81584a079fc7a18b53fc7db4232419a8faadd414 (diff) | |
| parent | 3126a1790e897252868941bd29a3dd526b506804 (diff) | |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: MAINTAINERS - Update SOUND
ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0beac8a7f8f2..1e067a675e53 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5235,7 +5235,12 @@ M: perex@perex.cz | |||
| 5235 | P: Takashi Iwai | 5235 | P: Takashi Iwai |
| 5236 | M: tiwai@suse.de | 5236 | M: tiwai@suse.de |
| 5237 | L: alsa-devel@alsa-project.org (subscribers-only) | 5237 | L: alsa-devel@alsa-project.org (subscribers-only) |
| 5238 | W: http://www.alsa-project.org/ | ||
| 5239 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git | ||
| 5240 | T: git git://git.alsa-project.org/alsa-kernel.git | ||
| 5238 | S: Maintained | 5241 | S: Maintained |
| 5242 | F: Documentation/sound/ | ||
| 5243 | F: include/sound/ | ||
| 5239 | F: sound/ | 5244 | F: sound/ |
| 5240 | 5245 | ||
| 5241 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 5246 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |