diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-31 11:06:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-31 11:06:33 +0100 |
| commit | a1a668efd56139e5a14527df958a7f5580299db3 (patch) | |
| tree | 39f90993a65e5cf29c31e95865e135d4c303ad0a /net/net.c | |
| parent | 9370a3bbc478f623dd21d783560629ea2064625b (diff) | |
| parent | 0d94b74655adadbeee135aee9bc105a41a524436 (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 30 Mar 2016 21:51:01 BST 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:
block/nfs: add missing #include "qemu/cutils.h"
block/nfs: add missing #include "qapi/error.h"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/net.c')
0 files changed, 0 insertions, 0 deletions