diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-28 13:46:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-28 13:46:29 +0000 |
| commit | 3b6144bdbb42705c95e3ed0e8c7bbe277352c0b8 (patch) | |
| tree | 0935c432e4e47e4f98f77453fb04a4816182559c /dump.c | |
| parent | 9c5793c5036c7608ff2c87846c6d11f904c08b58 (diff) | |
| parent | b89834f4d79070a26536cb73fe5216a2364551eb (diff) | |
| download | qemu-3b6144bdbb42705c95e3ed0e8c7bbe277352c0b8.tar.gz qemu-3b6144bdbb42705c95e3ed0e8c7bbe277352c0b8.tar.bz2 qemu-3b6144bdbb42705c95e3ed0e8c7bbe277352c0b8.zip | |
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 <mst@redhat.com>
# gpg: Signature made Fri 28 Mar 2014 12:00:12 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: 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 <peter.maydell@linaro.org>
Diffstat (limited to 'dump.c')
0 files changed, 0 insertions, 0 deletions