The following changes since commit 1dbc7cc9b91ba229ec958418bef483364f06fe72:
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160405' into staging (2016-04-05 09:32:35 +0100) are available in the git repository at: git://github.com/berrange/qemu tags/pull-qcrypto-2016-04-05-1 for you to fetch changes up to c44e92a4151248f80a31c8aa7343e399e508fa95: crypto: fix nettle config check for running pbkdf test (2016-04-05 10:52:57 +0100) ---------------------------------------------------------------- Merge QCrypto fixes 2016/04/05 v1 ---------------------------------------------------------------- Daniel P. Berrange (2): crypto: fix typo in docs for secret object type crypto: fix nettle config check for running pbkdf test qemu-options.hx | 2 +- tests/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.5.5
