summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-10-24 16:05:57 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-10-24 16:05:57 +0100
commit3d7196d43bfe12efe98568cb60057e273652b99b (patch)
tree60b785028ce32ef82b30dd403aaf0b21596be86e /monitor.c
parent9293fcfe253d29899e370ccf172a76b7eca49aac (diff)
parent31bd59db446de48eb985b4e1c0e31dae10fc35f8 (diff)
downloadqemu-3d7196d43bfe12efe98568cb60057e273652b99b.tar.gz
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20171023-pull-request' into staging
usb: ccid fix. # gpg: Signature made Mon 23 Oct 2017 09:45:00 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # 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>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/usb-20171023-pull-request: usb-ccid: remove needless migration state code Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
0 files changed, 0 insertions, 0 deletions