From: Anthony Liguori Date: Wed, 23 Jan 2013 15:08:33 +0000 (-0600) Subject: Merge remote-tracking branch 'kraxel/usb.77' into staging X-Git-Tag: v1.4.0-rc0~113 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=36ba58044e70a82b93e84b1f31076df847f23109;p=qemu.git Merge remote-tracking branch 'kraxel/usb.77' into staging # 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()" --- 36ba58044e70a82b93e84b1f31076df847f23109