tree 360b9559d0ed7faa747da79e5ae2958e933cb785
parent 259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f
parent 89a453d4a5c195e6d0a3c3d4fcaacb447447115f
author Anthony Liguori <aliguori@us.ibm.com> 1361461157 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1361461157 -0600

Merge remote-tracking branch 'kraxel/usb.78' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/usb.78:
  uas-uas: usb3 streams
  usb-xhci: usb3 streams
  usb-core: usb3 streams
  usb: fix endpoint descriptor ordering
  usb-redir: simplify packet copy
  usb: make usb_packet_copy operate on combined packets
  usb: add usb_ep_set_halted
  usb-host: remove usb_host_device_close
  usb-host: move legacy cmd line bits
  usb-storage: use scsi_req_enqueue return value
  allow disabling usb smartcard support
  make usb devices configurable
  fix scripts/make_device_config.sh
  usb: Makefile cleanup