diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-30 17:04:29 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-30 17:04:29 +0000 |
commit | f33f43bd86beb94ae1be14a62dc89cbeb4a665bb (patch) | |
tree | fbe5c32f91c47ca42f68919ea183a1ed61f25df7 /ui | |
parent | 3c1d9a15be679afd3fb9173a242827ff2d43af8f (diff) | |
parent | a65e4ef90f0fb437b8e74e250a6f94aa4ecfa25c (diff) | |
download | qemu-f33f43bd86beb94ae1be14a62dc89cbeb4a665bb.tar.gz qemu-f33f43bd86beb94ae1be14a62dc89cbeb4a665bb.tar.bz2 qemu-f33f43bd86beb94ae1be14a62dc89cbeb4a665bb.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141028-1' into staging
Fixes for libcacard (usb smartcard emulation), xhci and uhci.
# gpg: Signature made Tue 28 Oct 2014 10:39:52 GMT 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-20141028-1:
uhci: remove useless DEBUG
xhci: add property to turn on/off streams support
libcacard: don't free sign buffer while sign op is pending
libcacard: Lock NSS cert db when selecting an applet on an emulated card
libcacard: introduce new vcard_emul_logout
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
0 files changed, 0 insertions, 0 deletions