From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 8 Aug 2016 13:24:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160808' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=684b6b26af02a58692bb98578ff2653cd60dcb9c;p=qemu.git

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160808' into staging

One more s390x fix for a bug in the pci rework.

# gpg: Signature made Mon 08 Aug 2016 11:49:34 BST
# 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-20160808:
  s390x/pci: fix null pointer bug

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

684b6b26af02a58692bb98578ff2653cd60dcb9c