From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 9 Jul 2018 17:29:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3379c6cce7814b3371b66efc13c1bef3088ea9cd;p=qemu.git

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

x86 fix for -rc0

* Fix EPYC-IBPB compat code

# gpg: Signature made Mon 09 Jul 2018 18:21:27 BST
# 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-next-pull-request:
  pc: Fix typo on PC_COMPAT_2_12

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

3379c6cce7814b3371b66efc13c1bef3088ea9cd