diff options
author | Peter Maydell | 2016-03-30 16:04:08 +0200 |
---|---|---|
committer | Peter Maydell | 2016-03-30 16:04:08 +0200 |
commit | 69bc7f5029db5ea55359f7905e9829777ae5a34f (patch) | |
tree | a8241235364fce3e0ebff1ef7265e7d3e8cbf80e /stubs/replay.c | |
parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
parent | crypto: do an explicit check for nettle pbkdf functions (diff) | |
download | qemu-69bc7f5029db5ea55359f7905e9829777ae5a34f.tar.gz qemu-69bc7f5029db5ea55359f7905e9829777ae5a34f.tar.xz qemu-69bc7f5029db5ea55359f7905e9829777ae5a34f.zip |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-03-30-1' into staging
Merge qcrypto fixes 2016/03/30 v1
# gpg: Signature made Wed 30 Mar 2016 14:59:19 BST using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-qcrypto-2016-03-30-1:
crypto: do an explicit check for nettle pbkdf functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'stubs/replay.c')
0 files changed, 0 insertions, 0 deletions