Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: Orphan the UWB and WUSB subsystems
  uwb: Remove the WLP subsystem and drivers

1 files changed, 2 insertions, 16 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3e95a81e71e0..8f72c90aec0f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1562,9 +1562,8 @@ F:	net/ceph
 F:      include/linux/ceph
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
-M:      David Vrabel <david.vrabel@csr.com>
 L:      linux-usb@vger.kernel.org
-S:      Supported
+S:      Orphan
 F:      Documentation/usb/WUSB-Design-overview.txt
 F:      Documentation/usb/wusb-cbaf
 F:      drivers/usb/host/hwa-hc.c
@@ -5991,13 +5990,9 @@ F:	Documentation/filesystems/ufs.txt
 F:      fs/ufs/
 
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
-M:      David Vrabel <david.vrabel@csr.com>
 L:      linux-usb@vger.kernel.org
-S:      Supported
+S:      Orphan
 F:      drivers/uwb/
-X:      drivers/uwb/wlp/
-X:      drivers/uwb/i1480/i1480u-wlp/
-X:      drivers/uwb/i1480/i1480-wlp.h
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
 
@@ -6533,15 +6528,6 @@ F:	include/linux/wimax/debug.h
 F:      include/net/wimax.h
 F:      net/wimax/
 
-WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
-M:      David Vrabel <david.vrabel@csr.com>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      include/linux/wlp.h
-F:      drivers/uwb/wlp/
-F:      drivers/uwb/i1480/i1480u-wlp/
-F:      drivers/uwb/i1480/i1480-wlp.h
-
 WISTRON LAPTOP BUTTON DRIVER
 M:      Miloslav Trmac <mitr@volny.cz>
 S:      Maintained