projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitdcc8a3ab632d0f11a1bf3b08381cf0f93e616b9f
tree664e5f872907b22bdfbd07f344a1d9d28c875a26tree | snapshot
parentf73ca7363440240b7ee5ee7f7ddb1c64751efb54commit | diff
parentbd09594603f1498e7623f0030988b62e2052f7dacommit | diff
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

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>
Domain: SDK / Emulator;