From: Peter Maydell Date: Wed, 26 Mar 2014 15:15:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0a87466ef3fe3d9a062195f801727569ab886bde;p=qemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging acpi,virtio bug fixes Two bugfixes for virtio-net, and one for a recent regression in acpi. Both issues have been reported in the wild, so I think it's preferable to merge these ASAP so that reporters can make sure RC fixes their issue. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Wed 26 Mar 2014 10:52:16 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " * remotes/mst/tags/for_upstream: virtio-net: add vlan receive state to RxFilterInfo virtio-net: Do not filter VLANs without F_CTRL_VLAN Revert "acpi-test: rebuild SSDT" acpi: make SSDT 1.0 spec compliant when possible Signed-off-by: Peter Maydell --- 0a87466ef3fe3d9a062195f801727569ab886bde