From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 30 Oct 2014 17:04:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141028-1' into staging
X-Git-Tag: v2.2.0-rc0~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f33f43bd86beb94ae1be14a62dc89cbeb4a665bb;p=users%2Fdwmw2%2Fqemu.git

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>
---

f33f43bd86beb94ae1be14a62dc89cbeb4a665bb