Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 4 Sep 2014 11:20:41 +0000 (12:20 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 4 Sep 2014 11:20:41 +0000 (12:20 +0100)
commitb27e37d4ce4e9951afbb9280bb1416c13f562295
tree4ca66ea1042c149351511f6b74bde35e871d2ed9
parent4771b02512ddc52ee5b946a3487c78fbce60e0ab
parent07b81ed937b37e4c1974626c38e2f192ce08f8f5
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pci, pc fixes, features

A bunch of bugfixes - these will make sense for 2.1.1

Initial Intel IOMMU support.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 03 Sep 2014 14:41:23 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:
  acpi-build: Set FORCE_APIC_CLUSTER_MODEL bit for FADT flags
  vhost-scsi: init backend features earlier
  vhost_net: init acked_features to backend_features
  vhost_net: start/stop guest notifiers properly

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