diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-10 12:00:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-10 12:00:21 -0400 |
| commit | e6e8ac441cd2c1fed16f1864b170d9d471aeb7fe (patch) | |
| tree | 386c4334758639fd6bb21e6e4414bea6dff9cd37 /MAINTAINERS | |
| parent | 14e94194d10ce2b4207ce7bcdcd5e92a1977fe9f (diff) | |
| parent | 444ce9d44d00969479aa1d2675f305a779369194 (diff) | |
Merge tag 'usb-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are 3 small USB fixes for 3.11-rc5.
One is a fix that the ChromeOS developers ran into on some Intel
hardware, one is a build fix, and the last is a MAINTAINERS update to
help people figure out where to send USB network driver patches.
All of these have been in linux-next for a while"
* tag 'usb-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
MAINTAINERS: Add separate section for USB NETWORKING DRIVERS
usb: xhci: add missing dma-mapping.h includes
usb: core: don't try to reset_device() a port that got just disconnected
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 97053182fcf1..7cacc88dc79c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8669,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git | |||
| 8669 | S: Maintained | 8669 | S: Maintained |
| 8670 | F: sound/usb/midi.* | 8670 | F: sound/usb/midi.* |
| 8671 | 8671 | ||
| 8672 | USB NETWORKING DRIVERS | ||
| 8673 | L: linux-usb@vger.kernel.org | ||
| 8674 | S: Odd Fixes | ||
| 8675 | F: drivers/net/usb/ | ||
| 8676 | |||
| 8672 | USB OHCI DRIVER | 8677 | USB OHCI DRIVER |
| 8673 | M: Alan Stern <stern@rowland.harvard.edu> | 8678 | M: Alan Stern <stern@rowland.harvard.edu> |
| 8674 | L: linux-usb@vger.kernel.org | 8679 | L: linux-usb@vger.kernel.org |