Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
commitc2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 14 Apr 2014 13:02:12 +0000 (14 14:02 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 14 Apr 2014 13:02:12 +0000 (14 14:02 +0100)
tree21c31bf2d3c7adaf0cf988e6cd35f5b706237751
parent940973ae0b45c9b6817bab8e4cf4df99a9ef83d7
parent8611224a7b21db8fa1b0d12fdd053443543dd708
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

acpi: SSDT update

This has a fix by Igor for a regression introduced by
bridge hotplug code.
Expected test files were updated accordingly.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 14 Apr 2014 13:13:35 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-test: update expected files
  acpi: fix incorrect encoding for 0x{F-1}FFFF

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