Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
commitf516a5cc051db6e999e9e60dc968dcb5aeffe11f
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 10 Apr 2014 22:07:55 +0000 (10 23:07 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 10 Apr 2014 22:07:56 +0000 (10 23:07 +0100)
treec048a3497d51133250d54d822d8dc9b08fee83d6
parent0a9077ea144a7e6a6f456b94e2d2eaad21e74d34
parent775478418a5244b28ce891e398e0232dc4e60b43
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

acpi: DSDT update

Two fixes here:
- Test fix to avoid warning with make check.
- Hex file update so people building QEMU
  without installing iasl get exactly the same ACPI
  as with.

Both should help avoid user confusion.

As it's very easy to check that the produced ACPI
binary didn't change, I think these are very low risk.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 10 Apr 2014 17:09:43 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: update generated hex files
  tests/acpi: update expected DSDT files

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