summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-19 11:40:02 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-19 11:40:02 +0200
commitd6aa764ee8674512287913fcc3a0b1b5c050d5eb (patch)
tree0cb4a8f6d6cd6f649e705dce6390fa99afc859e0 /MAINTAINERS
parent81584a079fc7a18b53fc7db4232419a8faadd414 (diff)
parent3126a1790e897252868941bd29a3dd526b506804 (diff)
downloadlinux-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.tar.gz
linux-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.tar.bz2
linux-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.zip
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--MAINTAINERS5
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
P: Takashi Iwai
M: tiwai@suse.de
L: alsa-devel@alsa-project.org (subscribers-only)
+W: http://www.alsa-project.org/
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+T: git git://git.alsa-project.org/alsa-kernel.git
S: Maintained
+F: Documentation/sound/
+F: include/sound/
F: sound/
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)