diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 08:30:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 08:30:48 -0700 |
| commit | c55960499f810357a29659b32d6ea594abee9237 (patch) | |
| tree | b65748db925f7ec894e0b2cf8783609c6fbc88be /MAINTAINERS | |
| parent | fbaab1dc19751c80a7df62425f1d9ad2688e42f5 (diff) | |
| parent | 10c6c9c94c3eaadd7f9d6bafccc8709eda0da0f5 (diff) | |
| download | linux-3.10-c55960499f810357a29659b32d6ea594abee9237.tar.gz linux-3.10-c55960499f810357a29659b32d6ea594abee9237.tar.bz2 linux-3.10-c55960499f810357a29659b32d6ea594abee9237.zip | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3e95a81e71e..8f72c90aec0 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 |