[Midnightbsd-cvs] src: i386/libi386: resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve conflicts

Modified Files:
--------------
    src/sys/boot/i386/libi386:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/Makefile?r1=1.2&r2=1.3)
        biosacpi.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/biosacpi.c?r1=1.2&r2=1.3)
        bioscd.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/bioscd.c?r1=1.2&r2=1.3)
        biosdisk.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/biosdisk.c?r1=1.4&r2=1.5)
        biosmem.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/biosmem.c?r1=1.2&r2=1.3)
        biospci.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/biospci.c?r1=1.2&r2=1.3)
        biospnp.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/biospnp.c?r1=1.2&r2=1.3)
        biossmap.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/biossmap.c?r1=1.2&r2=1.3)
        bootinfo32.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/bootinfo32.c?r1=1.2&r2=1.3)
        bootinfo64.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/bootinfo64.c?r1=1.2&r2=1.3)
        comconsole.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/comconsole.c?r1=1.2&r2=1.3)
        devicename.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/devicename.c?r1=1.2&r2=1.3)
        elf32_freebsd.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/elf32_freebsd.c?r1=1.2&r2=1.3)
        elf64_freebsd.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/elf64_freebsd.c?r1=1.2&r2=1.3)
        i386_module.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/i386_module.c?r1=1.2&r2=1.3)
        libi386.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/libi386.h?r1=1.2&r2=1.3)
        pxe.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/pxe.c?r1=1.2&r2=1.3)
        smbios.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/smbios.c?r1=1.2&r2=1.3)
        time.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/time.c?r1=1.2&r2=1.3)
        vidconsole.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libi386/vidconsole.c?r1=1.2&r2=1.3)