| commit | 2ad032b85dcfc62976c326ddb79dd4d2b7426683 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 12:04:59 +0000 (30 15:04 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 12:04:59 +0000 (30 15:04 +0300) | ||
| tree | 5b37650750e926b5ec455090be44286ef39798cd | treesnapshot (tar.gz zip) |
| parent | 286b9f0ff3aabe4ef31557edeaa2691a7634b95a | commitdiff |
| parent | a08d43677f87a19daa653774d3c6f71855e23178 | commitdiff |
Merge commit 'a08d43677f87a19daa653774d3c6f71855e23178' into upstream-merge
* commit 'a08d43677f87a19daa653774d3c6f71855e23178':
Revert "Introduce reset notifier order"
Conflicts:
hw/ioapic.c
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'a08d43677f87a19daa653774d3c6f71855e23178':
Revert "Introduce reset notifier order"
Conflicts:
hw/ioapic.c
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
12 files changed: