From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 30 Mar 2016 14:04:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-03-30-1' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=69bc7f5029db5ea55359f7905e9829777ae5a34f;p=qemu.git

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

69bc7f5029db5ea55359f7905e9829777ae5a34f