diff options
author | Peter Maydell | 2018-07-24 11:37:52 +0200 |
---|---|---|
committer | Peter Maydell | 2018-07-24 11:37:52 +0200 |
commit | 768cef2974fb1fa30dd188b043ea737e13fea477 (patch) | |
tree | 1a20d23ed14230ab9e1381b9efd8785d64f6f786 /tests/pnv-xscom-test.c | |
parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180723' into staging (diff) | |
parent | i386: Rename enum CacheType members (diff) | |
download | qemu-768cef2974fb1fa30dd188b043ea737e13fea477.tar.gz qemu-768cef2974fb1fa30dd188b043ea737e13fea477.tar.xz qemu-768cef2974fb1fa30dd188b043ea737e13fea477.zip |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
Fix for -rc2
* Fix build failure on mips host
# gpg: Signature made Mon 23 Jul 2018 20:44:47 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:
i386: Rename enum CacheType members
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/pnv-xscom-test.c')
0 files changed, 0 insertions, 0 deletions