diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-23 10:24:08 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-23 10:24:08 +0100 |
commit | dfbe0642ef8e643e7e41956c8ca97f1acc9464a9 (patch) | |
tree | 067c4dacba11bcd0314efa94ec028b34681a11ca /monitor.c | |
parent | 6a6739de510706e1d337180d12be74ebbd0c7666 (diff) | |
parent | 7f4a930e64b9e69cd340395a7e4f0494aef4fcdd (diff) |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost: build fix
Fix build breakages when using older gcc.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 22 Oct 2015 20:36:07 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
vhost-user: fix up rhel6 build
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
0 files changed, 0 insertions, 0 deletions