tree 46a303e7605560b367d97d237e3088462b05c987
parent 032624868df264d395ee9900331f08bad1431022
parent 4f4f6976d80614e2d81cea4385885876f24bb257
author Peter Maydell <peter.maydell@linaro.org> 1436455357 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1436455357 +0100
mergetag object 4f4f6976d80614e2d81cea4385885876f24bb257
 type commit
 tag for-upstream
 tagger Paolo Bonzini <pbonzini@redhat.com> 1436453643 +0200
 
 Fixes for two bad bugs.  For 2.4-rc0.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJVnosbAAoJEL/70l94x66DNAIH/A+CeUPABxtDYJzO7ih33jqg
 NiTczWfc3LWac/CldeEkF4KX6TA7S671TTJgPcXdwsEtNK4Ao8YMhCHboFvRl2br
 Ie1k6CzuMwaqg0ugNlSrAY0G4e7e6IEaW0PK5DRWriG+0W9JiTGrBkCnrbNLxGxX
 Im8BaDlfz38/xSGlJbgoc20OpuOoz6T1HDi2WSQmyQuuYCvmXYa6aiattfOY12F8
 NSWQX72uehBM2S0g2tlZXn0fdARf8nMYOIBEtV4Xg522R+MEhPTVX+dbr8ecxosY
 rkovUz8DSTW/J7xt1MbjkyUlfQKwIqEVjARp1a/5tfpV9nz52uFqraY4QXDyJtA=
 =BNDR
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Fixes for two bad bugs.  For 2.4-rc0.

# gpg: Signature made Thu Jul  9 15:54:19 2015 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  crypto: fix builtin qcrypto_cipher_free
  migration: fix RCU deadlock

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>