From: Peter Maydell Date: Mon, 11 May 2015 08:42:20 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150508-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4ae740cc0e4a123047b40c373e699e28031d420e;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150508-1' into staging usb: qomify, bugfixes for xhci & uhci. # gpg: Signature made Fri May 8 12:39:28 2015 BST 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-20150508-1: uhci: controller is halted after reset usb: usb-serial QOMify usb: usb-redir QOMify usb: usb-wacom-tablet QOMify usb: usb-uas QOMify usb: usb-storage QOMify usb: usb-ccid QOMify usb: usb-net QOMify usb-mtp: fix segmentation fault usb: usb-mtp QOMify usb: usb-hub QOMify usb: usb-hid QOMify usb: usb-bt QOMify usb: usb-audio QOMify uhci: QOMify xhci: fix events for setup trb. Revert "xhci: generate a Transfer Event for each Transfer TRB with the IOC bit set" xhci: set timer to retry xfers usb: fix usb-net segfault Signed-off-by: Peter Maydell --- 4ae740cc0e4a123047b40c373e699e28031d420e