diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-28 11:15:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-28 11:15:17 -0700 |
commit | 2e34b429a404675dc4fc4ad2ee339eea028da3ca (patch) | |
tree | 93c9595fa65bf1e676f9b2a2b03bc8c187c25d06 /MAINTAINERS | |
parent | 04b905942b482092a547798a2477f21e32a8f65d (diff) | |
parent | 857aab34f04ff86666aa80e751ee696eff0113dd (diff) | |
download | kernel_samsung_aries-2e34b429a404675dc4fc4ad2ee339eea028da3ca.zip kernel_samsung_aries-2e34b429a404675dc4fc4ad2ee339eea028da3ca.tar.gz kernel_samsung_aries-2e34b429a404675dc4fc4ad2ee339eea028da3ca.tar.bz2 |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
MAINTAINERS: add myself as maintainer of USB/IP
usb: r8a66597-hcd: fix cannot detect low/full speed device
USB: ehci-ath79: fix a NULL pointer dereference
USB: Add new FT232H chip to drivers/usb/serial/ftdi_sio.c
usb/isp1760: Fix bug preventing the unlinking of control urbs
USB: Fix up URB error codes to reflect implementation.
xhci: Always set urb->status to zero for isoc endpoints.
xhci: Add reset on resume quirk for asrock p67 host
xHCI 1.0: Incompatible Device Error
USB: don't let errors prevent system sleep
USB: don't let the hub driver prevent system sleep
USB: change maintainership of ohci-hcd and ehci-hcd
xHCI 1.0: Force Stopped Event(FSE)
xhci: Don't warn about zeroed bMaxBurst descriptor field.
USB: Free bandwidth when usb_disable_device is called.
xhci: Reject double add of active endpoints.
USB: TI 3410/5052 USB Serial Driver: Fix mem leak when firmware is too big.
usb: musb: gadget: clear TXPKTRDY flag when set FLUSHFIFO
usb: musb: host: compare status for negative error values
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f0358cd..d2dcef7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6434,8 +6434,9 @@ S: Maintained F: drivers/usb/misc/rio500* USB EHCI DRIVER +M: Alan Stern <stern@rowland.harvard.edu> L: linux-usb@vger.kernel.org -S: Orphan +S: Maintained F: Documentation/usb/ehci.txt F: drivers/usb/host/ehci* @@ -6465,6 +6466,12 @@ S: Maintained F: Documentation/hid/hiddev.txt F: drivers/hid/usbhid/ +USB/IP DRIVERS +M: Matt Mooney <mfm@muteddisk.com> +L: linux-usb@vger.kernel.org +S: Maintained +F: drivers/staging/usbip/ + USB ISP116X DRIVER M: Olav Kongas <ok@artecdesign.ee> L: linux-usb@vger.kernel.org @@ -6494,8 +6501,9 @@ S: Maintained F: sound/usb/midi.* USB OHCI DRIVER +M: Alan Stern <stern@rowland.harvard.edu> L: linux-usb@vger.kernel.org -S: Orphan +S: Maintained F: Documentation/usb/ohci.txt F: drivers/usb/host/ohci* |