diff options
author | 2014-05-15 18:01:46 +0100 | |
---|---|---|
committer | 2014-05-15 18:01:47 +0100 | |
commit | ba43bc25c9793ae57d7b5539fecc26015a96107f (patch) | |
tree | d12167b0f2c198436028e728d410379d23d1c3cb /scripts/qapi.py | |
parent | Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140515' into staging (diff) | |
parent | virtio: allow mapping up to max queue size (diff) | |
download | qemu-ba43bc25c9793ae57d7b5539fecc26015a96107f.tar.xz qemu-ba43bc25c9793ae57d7b5539fecc26015a96107f.zip |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio update
looks like a quiet week
minor bugfix in virtio by myself
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 13 May 2014 14:37:23 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
virtio: allow mapping up to max queue size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi.py')
0 files changed, 0 insertions, 0 deletions