Commit 9917f7bb authored by Linus Torvalds's avatar Linus Torvalds

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
parents dd508ae2 355ffe69
...@@ -1402,6 +1402,8 @@ L: linux-usb@vger.kernel.org ...@@ -1402,6 +1402,8 @@ L: linux-usb@vger.kernel.org
S: Supported S: Supported
F: Documentation/usb/WUSB-Design-overview.txt F: Documentation/usb/WUSB-Design-overview.txt
F: Documentation/usb/wusb-cbaf F: Documentation/usb/wusb-cbaf
F: drivers/usb/host/hwa-hc.c
F: drivers/usb/host/whci/
F: drivers/usb/wusbcore/ F: drivers/usb/wusbcore/
F: include/linux/usb/wusb* F: include/linux/usb/wusb*
...@@ -5430,7 +5432,10 @@ ULTRA-WIDEBAND (UWB) SUBSYSTEM: ...@@ -5430,7 +5432,10 @@ ULTRA-WIDEBAND (UWB) SUBSYSTEM:
M: David Vrabel <david.vrabel@csr.com> M: David Vrabel <david.vrabel@csr.com>
L: linux-usb@vger.kernel.org L: linux-usb@vger.kernel.org
S: Supported 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.h
F: include/linux/uwb/ F: include/linux/uwb/
...@@ -5943,9 +5948,12 @@ W: http://linuxwimax.org ...@@ -5943,9 +5948,12 @@ W: http://linuxwimax.org
WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
M: David Vrabel <david.vrabel@csr.com> M: David Vrabel <david.vrabel@csr.com>
L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: include/linux/wlp.h F: include/linux/wlp.h
F: drivers/uwb/wlp/ F: drivers/uwb/wlp/
F: drivers/uwb/i1480/i1480u-wlp/
F: drivers/uwb/i1480/i1480-wlp.h
WISTRON LAPTOP BUTTON DRIVER WISTRON LAPTOP BUTTON DRIVER
M: Miloslav Trmac <mitr@volny.cz> M: Miloslav Trmac <mitr@volny.cz>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment