diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-30 22:55:51 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-30 22:55:51 +0100 |
commit | d4892d935b035c2220827145524d0cf0573d1fea (patch) | |
tree | 99f6cb08298023bdb24d0cdea19fe78375fc92ee /qemu.nsi | |
parent | 627f91b1f80fecc73d00727181a9ddb6162cc30e (diff) | |
parent | fa92e218df1d7fcc01e1e5d8bbd77acdaf53c18b (diff) | |
download | qemu-d4892d935b035c2220827145524d0cf0573d1fea.zip qemu-d4892d935b035c2220827145524d0cf0573d1fea.tar.gz qemu-d4892d935b035c2220827145524d0cf0573d1fea.tar.bz2 |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150330' into staging
s390x fixes:
- virtqueue index issues in virtio-ccw
- cleanup and sign extension fix for the ipl device
# gpg: Signature made Mon Mar 30 08:52:54 2015 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
* remotes/cohuck/tags/s390x-20150330:
s390x/ipl: avoid sign extension
s390x: do not include ram_addr.h
virtio-ccw: range check in READ_VQ_CONF
virtio-ccw: fix range check for SET_VQ
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu.nsi')
0 files changed, 0 insertions, 0 deletions