tree 615ca3905876deeb3fa677aeac1b9f4d1ba604f2
parent 46cabfb41e9cb269affc14c8188f0c8745f8cd55
parent 4a93722f9c279184e95b1e1ad775c01deec05065
author Peter Maydell <peter.maydell@linaro.org> 1542723060 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1542723060 +0000
mergetag object 4a93722f9c279184e95b1e1ad775c01deec05065
 type commit
 tag x86-for-3.1-pull-request
 tagger Eduardo Habkost <ehabkost@redhat.com> 1542721404 -0200
 
 pc-*-3.1 machine-types
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJb9A98AAoJECgHk2+YTcWm884QALnJcRk3t72KdSmYFbcpPYy6
 1EgW4v0mNWGtSyvuSfD9gXYIJEFOLkPzSvphJ8GAb0ybGTBRfTXfuOuOmKNTsvZ7
 f9kKFH9LGXSJqGfrkE18W0vCT0oC33X7zmFUKGAZXBSbrUv7d2MQ9XlMtDIMm6Zj
 WGXEksZImF8E/FugsKmOAyty8TOY175nP1xhPvpMeyrNsJaFqjzWSUt/KctUObvq
 bwwoBBKqJOKikMsifQ1LarCY94SWufoupABSDxnkQ+Ib6dQ2/wpxhd2LoGkm3ji0
 2ZnGvs+uGTesH9i+Wa80CMNXsH/Q3/P2re55JfImfMSRzrSvs82cnwQ+W0Bz6kx+
 bTKpLHyTz2LFIN6QpPvkelq7Qi6vjSVVNQwmmUc9+kMByfk7Parq2Tlv3qQfro9I
 IxsVFVxMo4piNxPlCuUZ0/7KbDKxBDQZ3bmGTHvFuFb3IGC1ZlVhYZmzk1CgPjZr
 /7eDhIIBjl9LIko178NUSjeHYl/Z+7/BAwht2vJwjV9ojASL5UnCkiTNN6Rhrr5k
 E0AIclHUA9bCjr90AfIqfl/WQrr2GcxaIl/g8WS0saxNqTj66xYosDIge9D5e1Jg
 6O2/HsoJADUtlQbBgU8mB/CKs2CDJ+oC/82ZUeetb0MfctR0W44RR8XFZ1Xp9TTn
 OwSuexRu7axAQUnU3707
 =OYoU
 -----END PGP SIGNATURE-----

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>