[Midnightbsd-cvs] src: sparc64/ebus: resolve conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/sparc64/ebus:
        ebus.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/sparc64/ebus/ebus.c?r1=1.2&r2=1.3)
        ebusreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/sparc64/ebus/ebusreg.h?r1=1.2&r2=1.3)