diff options
| author | Takashi Iwai | 2017-11-13 15:43:04 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2017-11-13 15:43:13 +0100 |
| commit | c429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch) | |
| tree | 80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /MAINTAINERS | |
| parent | 75ee94b20b46459e3d29f5ac2c3af3cebdeef777 (diff) | |
| parent | 9718a29d40b7e5ae4692796eb23c54f25559d35e (diff) | |
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index af0cb69f6a3e..cba2b4213492 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -527,11 +527,6 @@ W: http://ez.analog.com/community/linux-device-drivers S: Supported F: drivers/input/misc/adxl34x.c -AEDSP16 DRIVER -M: Riccardo Facchetti <fizban@tin.it> -S: Maintained -F: sound/oss/aedsp16.c - AF9013 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> L: linux-media@vger.kernel.org @@ -9199,12 +9194,6 @@ F: include/linux/dt-bindings/mux/ F: include/linux/mux/ F: drivers/mux/ -MULTISOUND SOUND DRIVER -M: Andrew Veliath <andrewtv@usa.net> -S: Maintained -F: Documentation/sound/oss/MultiSound -F: sound/oss/msnd* - MULTITECH MULTIPORT CARD (ISICOM) S: Orphan F: drivers/tty/isicom.c |