From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 31 Oct 2016 19:06:09 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b90da81d9f2d3d974db13bc69f961974741b0e2e;p=qemu.git

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging

x86 and machine queue, 2016-10-31

# gpg: Signature made Mon 31 Oct 2016 18:29:18 GMT
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-and-machine-pull-request:
  target-i386: Print warning when mixing [+-]foo and foo=(on|off)
  tests: Remove unneeded "-vnc none" option

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

b90da81d9f2d3d974db13bc69f961974741b0e2e