diff options
| author | Peter Maydell | 2014-03-26 16:15:19 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-03-26 16:15:19 +0100 |
| commit | 0a87466ef3fe3d9a062195f801727569ab886bde (patch) | |
| tree | cac808254cd497154225a25b91ed3c409b47e20f /hw/arm/integratorcp.c | |
| parent | Merge remote-tracking branch 'remotes/weil/qemu-2.0' into staging (diff) | |
| parent | virtio-net: add vlan receive state to RxFilterInfo (diff) | |
| download | qemu-0a87466ef3fe3d9a062195f801727569ab886bde.tar.gz qemu-0a87466ef3fe3d9a062195f801727569ab886bde.tar.xz qemu-0a87466ef3fe3d9a062195f801727569ab886bde.zip | |
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 <mst@redhat.com>
# gpg: Signature made Wed 26 Mar 2014 10:52:16 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: 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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/integratorcp.c')
0 files changed, 0 insertions, 0 deletions