From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 27 Jan 2017 13:30:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170126' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e14c2ffd541153a0c851b2163fc6f75587d9f176;p=qemu.git

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>
---

e14c2ffd541153a0c851b2163fc6f75587d9f176