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

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/boot/i386/boot2:
        Makefile (r1.7 -> r1.8)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/boot2/Makefile?r1=1.7&r2=1.8)
        boot1.S (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/boot2/boot1.S?r1=1.3&r2=1.4)
        boot2.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/boot2/boot2.c?r1=1.3&r2=1.4)