From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 16 Mar 2016 09:27:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~8^2~115
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af1d3ebbef5676a397d2767a1c0bd09984231ebf;p=sdk%2Femulator%2Fqemu.git

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>
---

af1d3ebbef5676a397d2767a1c0bd09984231ebf