projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31e49ac c833d1e)
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 11 Nov 2015 23:20:07 +0000 (23:20 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 11 Nov 2015 23:20:07 +0000 (23:20 +0000)
# gpg: Signature made Wed 11 Nov 2015 17:59:33 GMT using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"

* remotes/cody/tags/block-pull-request:
  gluster: allocate GlusterAIOCBs on the stack

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

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