Merge 3.16-rc4 into staging-next

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6813d0aa5ecf5c48868c6050532086b1c15f2b85..0782374db6d6600c8cbfda53168e6f7f9c4ccee1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8511,12 +8511,6 @@ L:       devel@driverdev.osuosl.org
 S:     Supported
 F:     drivers/staging/
 
-STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
-M:     Henk de Groot <pe1dnn@amsat.org>
-S:     Odd Fixes
-F:     drivers/staging/wlags49_h2/
-F:     drivers/staging/wlags49_h25/
-
 STAGING - ASUS OLED
 M:     Jakub Schmidtke <sjakub@gmail.com>
 S:     Odd Fixes
@@ -8528,14 +8522,6 @@ M:       H Hartley Sweeten <hsweeten@visionengravers.com>
 S:     Odd Fixes
 F:     drivers/staging/comedi/
 
-STAGING - CRYSTAL HD VIDEO DECODER
-M:     Naren Sankar <nsankar@broadcom.com>
-M:     Jarod Wilson <jarod@wilsonet.com>
-M:     Scott Davilla <davilla@4pi.com>
-M:     Manu Abraham <abraham.manu@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/crystalhd/
-
 STAGING - ECHO CANCELLER
 M:     Steve Underwood <steveu@coppice.org>
 M:     David Rowe <david@rowetel.com>
@@ -8654,11 +8640,6 @@ M:       Forest Bond <forest@alittletooquiet.net>
 S:     Odd Fixes
 F:     drivers/staging/vt665?/
 
-STAGING - WINBOND IS89C35 WLAN USB DRIVER
-M:     Pavel Machek <pavel@ucw.cz>
-S:     Odd Fixes
-F:     drivers/staging/winbond/
-
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 M:     Arnaud Patard <arnaud.patard@rtp-net.org>
 S:     Odd Fixes