OSDN Git Service

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)
commit7497b8dddcaee5b5f1851434607d0de044012ebe
treecb8855d68ac3fa17cd814dee826d0c3f84413b9f
parent31e49ac192f782d594bbd04070fe79e800b7813f
parentc833d1e8f5e95762336a823a35ade65a2d0fe587
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# 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>