diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 15:15:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 15:15:19 +0000 |
| commit | 0a87466ef3fe3d9a062195f801727569ab886bde (patch) | |
| tree | cac808254cd497154225a25b91ed3c409b47e20f /hw/intc/omap_intc.c | |
| parent | 0acf0a50c8ae6a4e146e00df5dba9f763d7b75a6 (diff) | |
| parent | f7bc8ef8091229a4bec0e2a40af90abb8dcb3834 (diff) | |
| download | focaccia-qemu-0a87466ef3fe3d9a062195f801727569ab886bde.tar.gz focaccia-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/intc/omap_intc.c')
0 files changed, 0 insertions, 0 deletions