MAINTAINERS: update staging removals and movements

3 sections have been deleted by various commits.  The other, echo, has
been moved to drivers/misc.

The nominal maintainers of the echo subsystem haven't been modifying the
code or acking/signing patches for several years, so don't keep the
section either.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 70354e960e9fc8754df381a4975fe253e292a9d8..01d8eaf9ea84424d62f46ff96cd6bdd3cc9ced24 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5061,13 +5061,6 @@ S:       Maintained
 F:     Documentation/hwmon/k8temp
 F:     drivers/hwmon/k8temp.c
 
-KTAP
-M:     Jovi Zhangwei <jovi.zhangwei@gmail.com>
-W:     http://www.ktap.org
-L:     ktap@freelists.org
-S:     Maintained
-F:     drivers/staging/ktap/
-
 KCONFIG
 M:     "Yann E. MORIN" <yann.morin.1998@free.fr>
 L:     linux-kbuild@vger.kernel.org
@@ -8518,23 +8511,12 @@ L:      devel@driverdev.osuosl.org
 S:     Supported
 F:     drivers/staging/
 
-STAGING - ASUS OLED
-M:     Jakub Schmidtke <sjakub@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/asus_oled/
-
 STAGING - COMEDI
 M:     Ian Abbott <abbotti@mev.co.uk>
 M:     H Hartley Sweeten <hsweeten@visionengravers.com>
 S:     Odd Fixes
 F:     drivers/staging/comedi/
 
-STAGING - ECHO CANCELLER
-M:     Steve Underwood <steveu@coppice.org>
-M:     David Rowe <david@rowetel.com>
-S:     Odd Fixes
-F:     drivers/staging/echo/
-
 STAGING - ET131X NETWORK DRIVER
 M:     Mark Einon <mark.einon@gmail.com>
 S:     Odd Fixes
@@ -8606,11 +8588,6 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/rtl8723au/
 
-STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
-M:     Teddy Wang <teddy.wang@siliconmotion.com.cn>
-S:     Odd Fixes
-F:     drivers/staging/sm7xxfb/
-
 STAGING - SLICOSS
 M:     Lior Dotan <liodot@gmail.com>
 M:     Christopher Harrer <charrer@alacritech.com>