diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 12:01:29 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 12:01:29 +0400 |
commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /MAINTAINERS | |
parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
download | linux-02e5fbf622aabf68bdc02282a17a3aeed054237a.tar.xz |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 16a5c5f2c6a6..3dbf9833e47a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4264,6 +4264,13 @@ M: Tim Hockin <thockin@hockin.org> S: Maintained F: drivers/net/natsemi.c +NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER +M: Daniel Mack <zonque@gmail.com> +S: Maintained +L: alsa-devel@alsa-project.org +W: http://www.native-instruments.com +F: sound/usb/caiaq/ + NCP FILESYSTEM M: Petr Vandrovec <petr@vandrovec.name> S: Odd Fixes |