diff options
| author | Linus Torvalds <[email protected]> | 2017-07-07 13:42:04 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-07-07 13:42:04 -0700 | 
| commit | 6481352082e8c373a005387c4fc7258b197f0bc9 (patch) | |
| tree | 16efe1dd4812779587de36837fc979d5f0e7ad36 /Documentation/filesystems/conf.py | |
| parent | df7cb187edc726fe78f2c9818fb8eb534a61541c (diff) | |
| parent | dec08194ffeccfa1cf085906b53d301930eae18f (diff) | |
Merge tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
 "Here are some remaining USB fixes for 4.13-rc1. They were originally
  scheduled for 4.12-final, but I didn't send them to you in time.
  Because of that, they were in a separate branch from the larger USB
  set of patches, so here they are in a separate pull request.
  Nothing major here a all, just three small patches:
   - some usb-serial new device ids
   - xhci bugfix for some crazy AMD hardware
  All of these have been in linux-next for a long time with no reported
  issues"
* tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: Limit USB2 port wake support for AMD Promontory hosts
  USB: serial: qcserial: new Sierra Wireless EM7305 device ID
  USB: serial: option: add two Longcheer device ids
Diffstat (limited to 'Documentation/filesystems/conf.py')
0 files changed, 0 insertions, 0 deletions