Merge commit '93d89f63e5a297f8672daf5d8b7b4df2a999af61' into upstream-merge
commit65e807fdc71fee035002dea56215757d0b4836ef
authorAvi Kivity <avi@redhat.com>
Sun, 16 May 2010 12:43:13 +0000 (16 15:43 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 16 May 2010 12:43:13 +0000 (16 15:43 +0300)
treeee82e1704af3fee47628fc5fb94b9c88ddd75695
parenta1b659fd98b35b4b6624a3793b5e65a825a30190
parent93d89f63e5a297f8672daf5d8b7b4df2a999af61
Merge commit '93d89f63e5a297f8672daf5d8b7b4df2a999af61' into upstream-merge

* commit '93d89f63e5a297f8672daf5d8b7b4df2a999af61':
  acpi: split acpi.c into the common part and the piix4 part.

Conflicts:
Makefile.target
hw/acpi.c

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile.target
hw/acpi.c
hw/acpi_piix4.c