| commit | e9fd09f26754d4872d5c78bab9bb6d7c98e77809 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 23 Dec 2008 13:11:34 +0000 (23 15:11 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 23 Dec 2008 13:11:34 +0000 (23 15:11 +0200) | ||
| tree | 62fca41c4d4b62e94791b2d81392308848f071c4 | treesnapshot (tar.gz zip) |
| parent | 3be87e8462eda2e2f3710a91520d5514e82e6164 | commitdiff |
| parent | efb564ce650401ea4e7e30c3eec3d81a80523bfa | commitdiff |
Merge branch 'bochs-bios-cvs'
Conflicts:
bios/BIOS-bochs-latest
bios/BIOS-bochs-legacy
bios/acpi-dsdt.hex
bios/rombios.c
bios/rombios.h
bios/rombios32.c
bios/rombios32.ld
bios/rombios32start.S
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
bios/BIOS-bochs-latest
bios/BIOS-bochs-legacy
bios/acpi-dsdt.hex
bios/rombios.c
bios/rombios.h
bios/rombios32.c
bios/rombios32.ld
bios/rombios32start.S
Signed-off-by: Avi Kivity <avi@redhat.com>