diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 01:18:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 01:18:56 +0300 |
| commit | 9917f7bbe96432012d3ad8075e9fd99390255d0c (patch) | |
| tree | 4460ef91691044d4d5ee72061412b51f7d782d35 | |
| parent | dd508ae2dbff0cfc7401eb6e278339fc56bc5033 (diff) | |
| parent | 355ffe69cb329bb9ab9eca3ebef369268162220d (diff) | |
| download | linux-9917f7bbe96432012d3ad8075e9fd99390255d0c.tar.xz | |
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:
MAINTAINERS: update entries for WUSB, UWB and WLP subsystems
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index efd2ef2c2660..d5244f1580bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1402,6 +1402,8 @@ L: linux-usb@vger.kernel.org S: Supported F: Documentation/usb/WUSB-Design-overview.txt F: Documentation/usb/wusb-cbaf +F: drivers/usb/host/hwa-hc.c +F: drivers/usb/host/whci/ F: drivers/usb/wusbcore/ F: include/linux/usb/wusb* @@ -5430,7 +5432,10 @@ ULTRA-WIDEBAND (UWB) SUBSYSTEM: M: David Vrabel <david.vrabel@csr.com> L: linux-usb@vger.kernel.org S: Supported -F: drivers/uwb/* +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/ @@ -5943,9 +5948,12 @@ W: http://linuxwimax.org 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> |