diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 20:06:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 20:06:09 -0400 |
commit | 3e75c6de1ac33fe3500f44573d9212dc82c99f59 (patch) | |
tree | ef10932e204ba8a9885051b06d4524d284207d61 /MAINTAINERS | |
parent | cb1595563880a81dab6eab9a5ecb4520d2e76077 (diff) | |
parent | 940ab8f1ef9369da5b58a1bec6820bfd4a7b9042 (diff) |
Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB patches from Greg KH:
"Here's the big USB pull request for 3.15-rc1.
The normal set of patches, lots of controller driver updates, and a
smattering of individual USB driver updates as well.
All have been in linux-next for a while"
* tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (249 commits)
xhci: Transition maintainership to Mathias Nyman.
USB: disable reset-resume when USB_QUIRK_RESET is set
USB: unbind all interfaces before rebinding any
usb: phy: Add ulpi IDs for SMSC USB3320 and TI TUSB1210
usb: gadget: tcm_usb_gadget: stop format strings
usb: gadget: f_fs: add missing spinlock and mutex unlock
usb: gadget: composite: switch over to ERR_CAST()
usb: gadget: inode: switch over to memdup_user()
usb: gadget: f_subset: switch over to PTR_RET
usb: gadget: lpc32xx_udc: fix wrong clk_put() sequence
USB: keyspan: remove dead debugging code
USB: serial: add missing newlines to dev_<level> messages.
USB: serial: add missing braces
USB: serial: continue to write on errors
USB: serial: continue to read on errors
USB: serial: make bulk_out_size a lower limit
USB: cypress_m8: fix potential scheduling while atomic
devicetree: bindings: document lsi,zevio-usb
usb: chipidea: add support for USB OTG controller on LSI Zevio SoCs
usb: chipidea: imx: Use dev_name() for ci_hdrc name to distinguish USBs
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 48a88402c25d..7fe5977e80db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9130,8 +9130,7 @@ S: Maintained | |||
9130 | F: drivers/net/wireless/ath/ar5523/ | 9130 | F: drivers/net/wireless/ath/ar5523/ |
9131 | 9131 | ||
9132 | USB ATTACHED SCSI | 9132 | USB ATTACHED SCSI |
9133 | M: Matthew Wilcox <willy@linux.intel.com> | 9133 | M: Hans de Goede <hdegoede@redhat.com> |
9134 | M: Sarah Sharp <sarah.a.sharp@linux.intel.com> | ||
9135 | M: Gerd Hoffmann <kraxel@redhat.com> | 9134 | M: Gerd Hoffmann <kraxel@redhat.com> |
9136 | L: linux-usb@vger.kernel.org | 9135 | L: linux-usb@vger.kernel.org |
9137 | L: linux-scsi@vger.kernel.org | 9136 | L: linux-scsi@vger.kernel.org |
@@ -9357,7 +9356,7 @@ S: Maintained | |||
9357 | F: drivers/net/wireless/rndis_wlan.c | 9356 | F: drivers/net/wireless/rndis_wlan.c |
9358 | 9357 | ||
9359 | USB XHCI DRIVER | 9358 | USB XHCI DRIVER |
9360 | M: Sarah Sharp <sarah.a.sharp@linux.intel.com> | 9359 | M: Mathias Nyman <mathias.nyman@intel.com> |
9361 | L: linux-usb@vger.kernel.org | 9360 | L: linux-usb@vger.kernel.org |
9362 | S: Supported | 9361 | S: Supported |
9363 | F: drivers/usb/host/xhci* | 9362 | F: drivers/usb/host/xhci* |