]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0a5a4e0568d4cc981457a2d1e7f86923eeff94ed
treeb752da16bc3ccfb9fbca9a5cd0f70fe72aede41etree
parent1658dd32408c75e850b55ab0ff70d5cc402674d5commit | diff
parent6f06f178f96de3597e1098258ab5d11733ae8602commit | diff
Merge remote-tracking branch 'alon/libcacard' into staging

* 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
Qemu copy for testing