Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
commit087c4c9419d3086ac0a920899e4fed8ceaf9bb2b
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Mar 2015 12:18:44 +0000 (26 12:18 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Mar 2015 12:18:44 +0000 (26 12:18 +0000)
treeeb0096e540ee9d287b722cd3b7baa72423744894
parent37a518ae5dc22415a642ce05423d71f8d7b25cac
parent7e0e736ecdfeac6d3517513d3a702304e4f6cf59
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc, virtio bugfixes for 2.3

Several bugfixes, nothing stands out especially.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed Mar 25 12:42:10 2015 GMT 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-net: validate backend queue numbers against bus limitation
  virtio-serial: fix virtio config size
  acpi: Add missing GCC_FMT_ATTR to local function

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>