From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jun 2011 18:15:17 +0000 (-0700)
Subject: Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: MMI-PSA29.97-13-9~19070
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e34b429a404675dc4fc4ad2ee339eea028da3ca;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'usb-linus' of git://git./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
---

2e34b429a404675dc4fc4ad2ee339eea028da3ca
diff --cc MAINTAINERS
index f0358cd91de3,1f93f5084d26..d2dcef7cd9b2
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6462,9 -6459,15 +6463,15 @@@ M:	Jiri Kosina <jkosina@suse.cz
  L:	linux-usb@vger.kernel.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:	Maintained
 -F:	Documentation/usb/hiddev.txt
 +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