forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
21 changed files
with
164 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6434,8 +6434,9 @@ S: Maintained | |
F: drivers/usb/misc/rio500* | ||
|
||
USB EHCI DRIVER | ||
M: Alan Stern <[email protected]> | ||
L: [email protected] | ||
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 <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/staging/usbip/ | ||
|
||
USB ISP116X DRIVER | ||
M: Olav Kongas <[email protected]> | ||
L: [email protected] | ||
|
@@ -6494,8 +6501,9 @@ S: Maintained | |
F: sound/usb/midi.* | ||
|
||
USB OHCI DRIVER | ||
M: Alan Stern <[email protected]> | ||
L: [email protected] | ||
S: Orphan | ||
S: Maintained | ||
F: Documentation/usb/ohci.txt | ||
F: drivers/usb/host/ohci* | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
/* | ||
* Enhanced Host Controller Interface (EHCI) driver for USB. | ||
* | ||
* Maintainer: Alan Stern <[email protected]> | ||
* | ||
* Copyright (c) 2000-2004 by David Brownell | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
/* | ||
* OHCI HCD (Host Controller Driver) for USB. | ||
* Open Host Controller Interface (OHCI) driver for USB. | ||
* | ||
* Maintainer: Alan Stern <[email protected]> | ||
* | ||
* (C) Copyright 1999 Roman Weissgaerber <[email protected]> | ||
* (C) Copyright 2000-2004 David Brownell <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.