| commit | 78b84fdb9b8319e42544fd01694dace7a6f99ad4 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 9 May 2010 11:42:47 +0000 (9 14:42 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 9 May 2010 11:42:47 +0000 (9 14:42 +0300) | ||
| tree | a3ef2dbb86a1997c4615a4bc13b42267ecb5e702 | treesnapshot (tar.gz zip) |
| parent | 0527625a5211a3a10a5a6344fe071e58915177d9 | commitdiff |
| parent | ec5f92ce6ac8ec09056be77e03c941be188648fa | commitdiff |
Merge commit 'ec5f92ce6ac8ec09056be77e03c941be188648fa' into upstream-merge
* commit 'ec5f92ce6ac8ec09056be77e03c941be188648fa':
hw: better i440 emulation
Conflicts:
hw/piix_pci.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'ec5f92ce6ac8ec09056be77e03c941be188648fa':
hw: better i440 emulation
Conflicts:
hw/piix_pci.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pc.h | diff1 | diff2 | blobhistory |
| hw/piix_pci.c | diff1 | diff2 | blobhistory |