diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-11 09:42:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-11 09:42:20 +0100 |
| commit | 4ae740cc0e4a123047b40c373e699e28031d420e (patch) | |
| tree | b0df99e558b8b068c710661d66803961bb5bd6f6 /qjson.c | |
| parent | fc85cf4a8199a657fdfd5fb902f1835973406454 (diff) | |
| parent | ca5a21c40d95d7a4e26ea0a304fd2cd8ad4e6ae1 (diff) | |
| download | hqemu-4ae740cc0e4a123047b40c373e699e28031d420e.zip hqemu-4ae740cc0e4a123047b40c373e699e28031d420e.tar.gz | |
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) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'qjson.c')
0 files changed, 0 insertions, 0 deletions
