diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-31 14:48:47 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-31 14:48:47 +0000 |
commit | 0bb1137930f51a89fb1bfeb0c46aa68af0395167 (patch) | |
tree | 6456b6a0e0008f47710b6b301dd64471c1601b43 /memory.c | |
parent | eab9e9629c8f3c0ce87f7bcad82176f55029a640 (diff) | |
parent | 88ee13c7b656e5504613b527f3a51591e9afae69 (diff) |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20161031' into staging
Two PCI fixes/improvements for s390x.
# gpg: Signature made Mon 31 Oct 2016 10:09:24 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-20161031:
s390x/pci: Check memory region dispatching callbacks
s390x/pci: use generic interface to inject interrupt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'memory.c')
0 files changed, 0 insertions, 0 deletions