diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-18 12:58:38 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-18 12:58:39 +0100 |
commit | dba0f15a3b3a2e72a526be665efad73f3c34a5dd (patch) | |
tree | 7cc95ba19b2eb20ce8b9942e063f3776c6265da7 /rules.mak | |
parent | 30d9081d646cbcb37341738d19e29bf350f3dd66 (diff) | |
parent | 8030dca376fa1bc4d8a6be7628196578f8783ab3 (diff) | |
download | qemu-dba0f15a3b3a2e72a526be665efad73f3c34a5dd.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180518-pull-request' into staging
usb: two smartcard reader fixes.
# gpg: Signature made Fri 18 May 2018 08:50:01 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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-20180518-pull-request:
hw/usb/dev-smartcard-reader: Handle 64 B USB packets
ccid-card-passthru: fix regression in realize()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'rules.mak')
0 files changed, 0 insertions, 0 deletions