aboutsummaryrefslogtreecommitdiff
path: root/hw/s390x
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-11-10 16:01:35 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-11-10 16:01:35 +0000
commit4ffa88c99c54d2a30f79e3dbecec50b023eff1c8 (patch)
tree7d34e7b7046f135f433cd4a95b13c9c770e5f50e /hw/s390x
parent6058bfb00a7b11559819e50f9aaab3b287fd46cf (diff)
parentf1710638edb2e98008c2a733ffda63ef32b50411 (diff)
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging
Merge qcrypto 2017/11/08 v1 # gpg: Signature made Wed 08 Nov 2017 11:06:38 GMT # gpg: using RSA key 0xBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/pull-qcrypto-2017-11-08-1: crypto: afalg: fix a NULL pointer dereference tests: Run the luks tests in test-crypto-block only if encryption is available Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x')
0 files changed, 0 insertions, 0 deletions