]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/usb.77' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 23 Jan 2013 15:08:33 +0000 (09:08 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 23 Jan 2013 15:08:33 +0000 (09:08 -0600)
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/usb.77:
  usb: add usb-bot device (scsi bulk-only transport).
  ohci: add missing break
  Revert "usb-storage: Drop useless null test in usb_msd_handle_data()"


Trivial merge