From: Avi Kivity <[EMAIL PROTECTED]>

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 <[EMAIL PROTECTED]>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits

Reply via email to