summary refs log tree commit diff stats
path: root/hw/misc/mst_fpga.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-07-29 17:11:18 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-07-29 17:11:18 +0100
commit34e2746bca222db7cd22f1481bb24e54d2765bc1 (patch)
tree91042a47bfb99d3b48a5062bb4b82aa5d2e622a4 /hw/misc/mst_fpga.c
parent893dc8300c80e3dc32f31e968cf7aa0904da50c3 (diff)
parentff656fcd338a70c4d9783a800733c4ab3806e5b0 (diff)
downloadfocaccia-qemu-34e2746bca222db7cd22f1481bb24e54d2765bc1.tar.gz
focaccia-qemu-34e2746bca222db7cd22f1481bb24e54d2765bc1.zip
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
x86 queue for 4.1

* Rename and fix SnowRidge CPU model (Paul Lai)

# gpg: Signature made Mon 29 Jul 2019 17:09:34 BST
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-next-pull-request:
  i386: Fix Snowridge CPU model name and features

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/mst_fpga.c')
0 files changed, 0 insertions, 0 deletions