| commit | a1b659fd98b35b4b6624a3793b5e65a825a30190 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:32:29 +0000 (16 15:32 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:32:29 +0000 (16 15:32 +0300) | ||
| tree | b7e779d2e8e5888d24a47ef01aacc0312f11a78c | treesnapshot (tar.gz zip) |
| parent | 02de7077a33192db150b892dba0f833b1cddd287 | commitdiff |
| parent | 990b150e7c207cf00cc1ec61baa17d770307fac4 | commitdiff |
Merge commit '990b150e7c207cf00cc1ec61baa17d770307fac4' into upstream-merge
* commit '990b150e7c207cf00cc1ec61baa17d770307fac4':
acpi: add acpi constants from linux header files and use them.
Conflicts:
hw/acpi.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '990b150e7c207cf00cc1ec61baa17d770307fac4':
acpi: add acpi constants from linux header files and use them.
Conflicts:
hw/acpi.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/acpi.c | diff1 | diff2 | blobhistory |