From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 20 Nov 2018 14:11:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=53744e0a182a24dc9e78f2d9b31a39a33da79484;p=qemu.git

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request' into staging

pc-*-3.1 machine-types

# gpg: Signature made Tue 20 Nov 2018 13:43:24 GMT
# gpg:                using RSA key 2807936F984DC5A6
# 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-for-3.1-pull-request:
  hw/i386: add pc-i440fx-3.1 & pc-q35-3.1

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

53744e0a182a24dc9e78f2d9b31a39a33da79484