]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
projects / thirdparty / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1658dd3 6f06f17)
Merge remote-tracking branch 'alon/libcacard' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 28 Mar 2012 17:44:04 +0000 (12:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 28 Mar 2012 17:44:04 +0000 (12:44 -0500)
* alon/libcacard:
  libcacard/vcard_emul_nss: add warning for old coolkey
  libcacard/vcard_emul_nss: handle no readers at startup
  libcacard/vcard_emul_nss: don't stop thread when there are no slots


Trivial merge
Mirror of https://git.qemu.org/git/qemu.git