| commit | 768cef2974fb1fa30dd188b043ea737e13fea477 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 24 Jul 2018 09:37:52 +0000 (24 10:37 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 24 Jul 2018 09:37:52 +0000 (24 10:37 +0100) | ||
| tree | 1a20d23ed14230ab9e1381b9efd8785d64f6f786 | treesnapshot (tar.gz zip) |
| parent | 4eecc2e212bae7308d8582d99f665dfc253c9dda | commitdiff |
| parent | 5f00335aecafc9ad56592d943619d3252f8941f1 | commitdiff |
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>
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>