From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 17 Jul 2015 11:39:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150717-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b5e8cdd7da7a2214dd062afff5b866234aab228;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150717-1' into staging

usb: fixes for 2.4 (ccid, xhci and usb-host)

# gpg: Signature made Fri Jul 17 12:21:42 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20150717-1:
  Revert "xhci: set timer to retry xfers"
  usb-ccid: add missing wakeup calls
  usb-ccid: fix 61b4887b41b270bc837ead57bc502d904af023bb
  Re-attach usb device to kernel while usb_host_open fails

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

5b5e8cdd7da7a2214dd062afff5b866234aab228