From: Anthony Liguori Date: Wed, 28 Mar 2012 17:44:04 +0000 (-0500) Subject: Merge remote-tracking branch 'alon/libcacard' into staging X-Git-Tag: v1.1-rc0~186 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a5a4e0568d4cc981457a2d1e7f86923eeff94ed;p=thirdparty%2Fqemu.git 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 --- 0a5a4e0568d4cc981457a2d1e7f86923eeff94ed