From: Peter Maydell Date: Thu, 13 Nov 2014 10:54:05 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141112-1' into staging X-Git-Tag: v2.2.0-rc2~16 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=410bd787bf44ef95192507802967a0edce19955f;p=qemu-xen-unstable.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141112-1' into staging usb bugfixes for 2.2 # gpg: Signature made Wed 12 Nov 2014 14:35:09 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-usb-20141112-1: usb-host: fix usb_host_speed_compat tyops xhci: add sanity checks to xhci_lookup_uport Provide the missing LIBUSB_LOG_LEVEL_* for older libusb or FreeBSD. Providing just the needed value as a defined. Signed-off-by: Peter Maydell --- 410bd787bf44ef95192507802967a0edce19955f