diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-27 12:27:59 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-27 12:27:59 +0100 |
| commit | 6f0c4706b35dead265509115ddbd2a8d1af516c1 (patch) | |
| tree | 66512739bcaf181abb317003c7ec02acae3da6f8 /hw/s390x/s390-virtio-ccw.c | |
| parent | 10f4718b51d77ff06878afd326c3d3dd140770ee (diff) | |
| parent | 0f5c642d49c3a843bd8b8790d7014fd84bcf6405 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180427-pull-request' into staging
usb: ccid bugfix, misc small improvements.
# gpg: Signature made Fri 27 Apr 2018 11:20:18 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-20180427-pull-request:
ccid-card: include libcacard.h only
Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option
ccid: Fix dwProtocols advertisement of T=0
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
0 files changed, 0 insertions, 0 deletions