diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-28 15:55:14 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-28 15:55:14 -0800 | 
| commit | 4742eb3dadbb6970a8f267e4605192d1e8199425 (patch) | |
| tree | be49020fbd6502cde4c10da24d3800947afc6317 /net/lapb/lapb_subr.c | |
| parent | cba3b00deab5a8564d61ec18e61ba6ba82203299 (diff) | |
| parent | 263e80b43559a6103e178a9176938ce171b23872 (diff) | |
Merge tag 'usb-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
 "Here are some USB driver fixes and new device ids for 3.18-rc7.
  Full details are in the shortlog, and all of these have been in the
  linux-next tree for a while"
* tag 'usb-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000
  usb: xhci: rework root port wake bits if controller isn't allowed to wakeup
  USB: xhci: Reset a halted endpoint immediately when we encounter a stall.
  Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
  USB: xhci: don't start a halted endpoint before its new dequeue is set
  USB: uas: Add no-uas quirk for Hitachi usb-3 enclosures 4971:1012
  USB: ssu100: fix overrun-error reporting
  USB: keyspan: fix overrun-error reporting
  USB: keyspan: fix tty line-status reporting
  usb: serial: ftdi_sio: add PIDs for Matrix Orbital products
  usb: dwc3: ep0: fix for dead code
  USB: serial: cp210x: add IDs for CEL MeshConnect USB Stick
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions
