summary refs log tree commit diff stats
path: root/hw/core
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-08-08 14:24:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-08-08 14:24:51 +0100
commit684b6b26af02a58692bb98578ff2653cd60dcb9c (patch)
treec60d3f271a0109d3de7d01d7abbb5dcd08c2cdd0 /hw/core
parent47dc0ec576c3d8748985e34d273c8dc0465c5ddb (diff)
parent7fc0abf4cb740609e802611690a3cdb7ff5f21bd (diff)
downloadfocaccia-qemu-684b6b26af02a58692bb98578ff2653cd60dcb9c.tar.gz
focaccia-qemu-684b6b26af02a58692bb98578ff2653cd60dcb9c.zip
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>
Diffstat (limited to 'hw/core')
0 files changed, 0 insertions, 0 deletions