diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 23:20:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 23:20:07 +0000 |
| commit | 7497b8dddcaee5b5f1851434607d0de044012ebe (patch) | |
| tree | cb8855d68ac3fa17cd814dee826d0c3f84413b9f /.dir-locals.el | |
| parent | 31e49ac192f782d594bbd04070fe79e800b7813f (diff) | |
| parent | c833d1e8f5e95762336a823a35ade65a2d0fe587 (diff) | |
| download | hqemu-7497b8dddcaee5b5f1851434607d0de044012ebe.zip hqemu-7497b8dddcaee5b5f1851434607d0de044012ebe.tar.gz | |
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>
Diffstat (limited to '.dir-locals.el')
0 files changed, 0 insertions, 0 deletions
