From: Peter Maydell Date: Tue, 8 Apr 2014 12:59:28 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~912 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bc1a1d817670702f642633a325da346047f7508;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging acpi bug fix Here is a single last minute fix for 2.0 This changes the HID of the container used to claim resources for CPU hotplug. As a result, windows XP SP3 no longer brings up an annoying "found new hardware" wizard on boot. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Tue 08 Apr 2014 13:23:30 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " * remotes/mst/tags/for_upstream: dsdt: tweak ACPI ID for hotplug resource device Signed-off-by: Peter Maydell --- 9bc1a1d817670702f642633a325da346047f7508