| commit | 02de7077a33192db150b892dba0f833b1cddd287 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:31:10 +0000 (16 15:31 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:31:10 +0000 (16 15:31 +0300) | ||
| tree | 09dd1110b821d7ca2ec1cbc09089d8206b6cbecc | treesnapshot (tar.gz zip) |
| parent | 9fa1d2158218fe0e3b7982faa244d0d0e9790c14 | commitdiff |
| parent | 04762841d8803429fd9bf71eff481d3c5915fa3e | commitdiff |
Merge commit '04762841d8803429fd9bf71eff481d3c5915fa3e' into upstream-merge
* commit '04762841d8803429fd9bf71eff481d3c5915fa3e':
acpi: split out apm register emulation from acpi.c
Conflicts:
Makefile.target
hw/acpi.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '04762841d8803429fd9bf71eff481d3c5915fa3e':
acpi: split out apm register emulation from acpi.c
Conflicts:
Makefile.target
hw/acpi.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile.target | diff1 | diff2 | blobhistory |
| hw/acpi.c | diff1 | diff2 | blobhistory |