From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 15 May 2014 17:01:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: v2.1.0-rc0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba43bc25c9793ae57d7b5539fecc26015a96107f;p=thirdparty%2Fqemu.git

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>
---

ba43bc25c9793ae57d7b5539fecc26015a96107f