From: Anthony Liguori Date: Tue, 30 Jul 2013 23:48:54 +0000 (-0500) Subject: Merge remote-tracking branch 'kraxel/usb.85' into staging X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~68 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c095e108473f57516e7ad958d905a7017b225f82;p=qemu-upstream-unstable.git Merge remote-tracking branch 'kraxel/usb.85' into staging # By Gerd Hoffmann (2) and Alexey Kardashevskiy (1) # Via Gerd Hoffmann * kraxel/usb.85: hcd-ohci: add dma error handling uhci: egsm fix xhci: handle USB_RET_IOERROR Message-id: 1375173371-3378-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori --- c095e108473f57516e7ad958d905a7017b225f82