From: Peter Maydell Date: Fri, 28 Mar 2014 13:46:28 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~942 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b6144bdbb42705c95e3ed0e8c7bbe277352c0b8;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging acpi,pc,build bug fixes Here are some bugfixes for 2.0. A bugfix for acpi for pci bridges, and a build fix for old systems without pthread_setname_np: both fix regressions so we definitely want to include them. HPET fix is not for a regression but looks very safe, fixes a nasty bug and has been on list for a while. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Fri 28 Mar 2014 12:00:12 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " * remotes/mst/tags/for_upstream: acpi: fix ACPI generation for pci bridges Don't enable a HPET timer if HPET is disabled Detect pthread_setname_np at configure time Signed-off-by: Peter Maydell --- 3b6144bdbb42705c95e3ed0e8c7bbe277352c0b8