| commit | b02d6f08f5edcd677df2a4b41f169b3bb418d364 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 14:43:14 +0000 (16 17:43 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 14:43:14 +0000 (16 17:43 +0300) | ||
| tree | 80c7f785b2b8361ee5907ba97ac2b9695c55a479 | treesnapshot (tar.gz zip) |
| parent | 7fc11a0731595b94fc8fb18622b3fc1fe899eb24 | commitdiff |
| parent | 88c8e03f5ddca8c8448dbb99d9de07d87b03ddd6 | commitdiff |
Merge commit '88c8e03f5ddca8c8448dbb99d9de07d87b03ddd6' into upstream-merge
* commit '88c8e03f5ddca8c8448dbb99d9de07d87b03ddd6':
sparc64: fix TT_WOTHER value
sparc64: fix mmu demap operand typo
Update to a hopefully more future proof FSF address
Trim unnecessary includes
mc146818rtc: remove #ifdef DEBUG_CMOS.
apm: remove #ifdef DEBUG.
acpi_piix4: remove #ifdef DEBUG.
pm_smbus: remove #ifdef DEBUG.
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '88c8e03f5ddca8c8448dbb99d9de07d87b03ddd6':
sparc64: fix TT_WOTHER value
sparc64: fix mmu demap operand typo
Update to a hopefully more future proof FSF address
Trim unnecessary includes
mc146818rtc: remove #ifdef DEBUG_CMOS.
apm: remove #ifdef DEBUG.
acpi_piix4: remove #ifdef DEBUG.
pm_smbus: remove #ifdef DEBUG.
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/acpi.c | diff1 | diff2 | blobhistory |
| hw/acpi_piix4.c | diff1 | diff2 | blobhistory |