From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 13 Jul 2015 12:35:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3a1b5068cea303a55e2a21a97e66d057eaae638;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc,virtio: fixes for 2.4

pc and virtio changes, bugfixes only.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Mon Jul 13 13:03:38 2015 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:
  pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3
  Revert "virtio-net: enable virtio 1.0"
  virtio-pci: don't crash on illegal length
  qdev: fix 64 bit properties

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

f3a1b5068cea303a55e2a21a97e66d057eaae638