[Midnightbsd-cvs] src: dev/nfe: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/dev/nfe:
        if_nfe.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/nfe/if_nfe.c?r1=1.2&r2=1.3)
        if_nfereg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/nfe/if_nfereg.h?r1=1.2&r2=1.3)
        if_nfevar.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/nfe/if_nfevar.h?r1=1.2&r2=1.3)