| commit | 8d604b7fc3430281d958020aaba05311f571b5ef | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Sep 2008 13:27:32 +0000 (30 16:27 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Sep 2008 13:27:32 +0000 (30 16:27 +0300) | ||
| tree | 14dedabeaf2af3496227d18dda527efb5fdc13ca | treesnapshot (tar.gz zip) |
| parent | aac2a2a7c8d7c3df6ba157818baa468179348b4a | commitdiff |
| parent | 05e7e6123a5b009aa2ef9579502b7a7e6467362a | commitdiff |
Merge branch 'bochs-bios-cvs' into bios-merge-2
Conflicts:
bios/acpi-dsdt.dsl
bios/rombios32.c
bios/rombios32start.S
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
bios/acpi-dsdt.dsl
bios/rombios32.c
bios/rombios32start.S
Signed-off-by: Avi Kivity <avi@redhat.com>
| bios/acpi-dsdt.dsl | diff1 | diff2 | blobhistory |
| bios/rombios.c | diff1 | diff2 | blobhistory |
| bios/rombios32.c | diff1 | diff2 | blobhistory |
| bios/rombios32start.S | diff1 | diff2 | blobhistory |