projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbef7b1 cf66ee8)
Merge remote-tracking branch 'kraxel/usb.85' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Jul 2013 23:48:54 +0000 (18:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Jul 2013 23:48:54 +0000 (18:48 -0500)
# 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 <aliguori@us.ibm.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.