| commit | 35df6101057297909a5ea94f50fa3faaa56d2862 | |
| author | Avi Kivity <avi@qumranet.com> | |
| Sun, 17 Feb 2008 14:47:50 +0000 (17 16:47 +0200) | ||
| committer | Avi Kivity <avi@qumranet.com> | |
| Sun, 17 Feb 2008 15:42:10 +0000 (17 17:42 +0200) | ||
| tree | 120b15d4e8f55cfd99f3b7f36ccea1ac5c8e1fd2 | treesnapshot (tar.gz zip) |
| parent | 95b3792fc2fd8b8a1395458264e48d200e47e9c9 | commitdiff |
| parent | b244eafb405a8ff1aaa4cfe7f845f1a9a2247563 | commitdiff |
kvm: bios: merge branch 'bochs-bios-cvs'
Conflicts:
bios/Makefile.in
bios/acpi-dsdt.dsl
bios/apmbios.S
bios/biossums.c
bios/makesym.perl
bios/rombios.c
bios/rombios.h
bios/rombios32.c
bios/rombios32.ld
bios/rombios32start.S
bios/usage.cc
Signed-off-by: Avi Kivity <avi@qumranet.com>
Conflicts:
bios/Makefile.in
bios/acpi-dsdt.dsl
bios/apmbios.S
bios/biossums.c
bios/makesym.perl
bios/rombios.c
bios/rombios.h
bios/rombios32.c
bios/rombios32.ld
bios/rombios32start.S
bios/usage.cc
Signed-off-by: Avi Kivity <avi@qumranet.com>