projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f73ca73 bd09594)
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Jul 2015 15:01:31 +0000 (16:01 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Jul 2015 15:01:31 +0000 (16:01 +0100)
Block layer patches for 2.4.0-rc2

# gpg: Signature made Mon Jul 20 15:48:56 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  crypto: Fix aes_decrypt_wrapper()

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.