[Midnightbsd-cvs] src: boot/sparc64: Resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve conflicts

Modified Files:
--------------
    src/sys/boot/sparc64:
        Makefile.inc (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/sparc64/Makefile.inc?r1=1.2&r2=1.3)
    src/sys/boot/sparc64/loader:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/sparc64/loader/Makefile?r1=1.2&r2=1.3)
        main.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/sparc64/loader/main.c?r1=1.2&r2=1.3)