diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-16 09:27:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-16 09:27:58 +0000 |
| commit | af1d3ebbef5676a397d2767a1c0bd09984231ebf (patch) | |
| tree | d5dbc640cccbf753b0923913b0b4701752be584f | |
| parent | 4caecccbc13b23c1e7344046f6d0c346be6297a3 (diff) | |
| parent | 3ba6a710e6ca1fb52cfdb38f39268e5c6e380ef9 (diff) | |
| download | qemu-af1d3ebbef5676a397d2767a1c0bd09984231ebf.zip qemu-af1d3ebbef5676a397d2767a1c0bd09984231ebf.tar.gz qemu-af1d3ebbef5676a397d2767a1c0bd09984231ebf.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
acpi: minor fix
Since previous pull acpi test triggers warnings,
fix it up.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 15 Mar 2016 21:26:38 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:
acpi-test: update UID for GSI links
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT | bin | 8349 -> 8357 bytes |
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT.bridge | bin | 8366 -> 8374 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT Binary files differindex cb720f4..1c089c3 100644 --- a/tests/acpi-test-data/q35/DSDT +++ b/tests/acpi-test-data/q35/DSDT diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge Binary files differindex dd4c285..b29fcda 100644 --- a/tests/acpi-test-data/q35/DSDT.bridge +++ b/tests/acpi-test-data/q35/DSDT.bridge |