| commit | 6cb7fa4ef6caf86157f79e6e64ae1d84b7a379b1 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 15:32:41 +0000 (21 18:32 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 15:32:41 +0000 (21 18:32 +0300) | ||
| tree | 87729f2c957a3a7c010b521c6898f94da734e3fd | treesnapshot (tar.gz zip) |
| parent | 5bcd3bb97c55d21c73188ebf8b4737228921c6e7 | commitdiff |
| parent | 92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd | commitdiff |
Merge commit '92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd' into upstream-merge
* commit '92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd':
apic: qdev conversion cleanup
Conflicts:
hw/apic.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd':
apic: qdev conversion cleanup
Conflicts:
hw/apic.h
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/apic.c | diff1 | diff2 | blobhistory |
| hw/apic.h | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |
| target-i386/cpu.h | diff1 | diff2 | blobhistory |