Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git] / MAINTAINERS
index a76f02f64469514eda06996a86f3bc6d19a820b2..fbebd08ae42e4a498fcd56743d4a0bd5b7c4ba3c 100644 (file)
@@ -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
@@ -9222,12 +9217,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
@@ -14638,6 +14627,7 @@ F:      Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 F:     Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 F:     Documentation/devicetree/bindings/mfd/arizona.txt
 F:     Documentation/devicetree/bindings/mfd/wm831x.txt
+F:     Documentation/devicetree/bindings/sound/wlf,arizona.txt
 F:     arch/arm/mach-s3c64xx/mach-crag6410*
 F:     drivers/clk/clk-wm83*.c
 F:     drivers/extcon/extcon-arizona.c