summary refs log tree commit diff stats
path: root/stubs/error-printf.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-10-31 19:06:09 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-10-31 19:06:09 +0000
commitb90da81d9f2d3d974db13bc69f961974741b0e2e (patch)
tree226b97684ddd9959a3e84a43a6f5f56ddff04e2a /stubs/error-printf.c
parente80b4b8fb6babce7dcc91ea9ddeecbc351fd4646 (diff)
parent83a00f6095a36de2024d6cca57470c4dedfb85ee (diff)
downloadfocaccia-qemu-b90da81d9f2d3d974db13bc69f961974741b0e2e.tar.gz
focaccia-qemu-b90da81d9f2d3d974db13bc69f961974741b0e2e.zip
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>
Diffstat (limited to 'stubs/error-printf.c')
0 files changed, 0 insertions, 0 deletions