diff options
| author | Peter Maydell | 2017-01-27 14:30:50 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-27 14:30:50 +0100 |
| commit | e14c2ffd541153a0c851b2163fc6f75587d9f176 (patch) | |
| tree | 8e9885d6864abb13f0114e0933b2cb62c906663a /include/hw/compat.h | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | s390x/flic: fix compilation of kvm flic (diff) | |
| download | qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.tar.gz qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.tar.xz qemu-e14c2ffd541153a0c851b2163fc6f75587d9f176.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170126' into staging
One compile fix for s390x with kvm enabled.
# gpg: Signature made Thu 26 Jan 2017 10:57:55 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20170126:
s390x/flic: fix compilation of kvm flic
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/compat.h')
0 files changed, 0 insertions, 0 deletions