diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
| commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
| tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /MAINTAINERS | |
| parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
| parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
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> | |||
| 4264 | S: Maintained | 4264 | S: Maintained |
| 4265 | F: drivers/net/natsemi.c | 4265 | F: drivers/net/natsemi.c |
| 4266 | 4266 | ||
| 4267 | NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER | ||
| 4268 | M: Daniel Mack <zonque@gmail.com> | ||
| 4269 | S: Maintained | ||
| 4270 | L: alsa-devel@alsa-project.org | ||
| 4271 | W: http://www.native-instruments.com | ||
| 4272 | F: sound/usb/caiaq/ | ||
| 4273 | |||
| 4267 | NCP FILESYSTEM | 4274 | NCP FILESYSTEM |
| 4268 | M: Petr Vandrovec <petr@vandrovec.name> | 4275 | M: Petr Vandrovec <petr@vandrovec.name> |
| 4269 | S: Odd Fixes | 4276 | S: Odd Fixes |