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

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/dev/mii:
        acphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/acphy.c?r1=1.3&r2=1.4)
        acphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/acphyreg.h?r1=1.3&r2=1.4)
        amphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/amphy.c?r1=1.3&r2=1.4)
        amphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/amphyreg.h?r1=1.3&r2=1.4)
        bmtphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/bmtphy.c?r1=1.3&r2=1.4)
        bmtphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/bmtphyreg.h?r1=1.3&r2=1.4)
        brgphy.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/brgphy.c?r1=1.5&r2=1.6)
        brgphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/brgphyreg.h?r1=1.3&r2=1.4)
        ciphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ciphy.c?r1=1.3&r2=1.4)
        ciphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ciphyreg.h?r1=1.3&r2=1.4)
        e1000phy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/e1000phy.c?r1=1.3&r2=1.4)
        e1000phyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/e1000phyreg.h?r1=1.3&r2=1.4)
        gentbi.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/gentbi.c?r1=1.3&r2=1.4)
        icsphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/icsphy.c?r1=1.3&r2=1.4)
        icsphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/icsphyreg.h?r1=1.3&r2=1.4)
        ip1000phy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ip1000phy.c?r1=1.3&r2=1.4)
        ip1000phyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ip1000phyreg.h?r1=1.3&r2=1.4)
        lxtphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/lxtphy.c?r1=1.3&r2=1.4)
        lxtphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/lxtphyreg.h?r1=1.3&r2=1.4)
        mii.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii.c?r1=1.5&r2=1.6)
        mii.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii.h?r1=1.3&r2=1.4)
        mii_physubr.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mii_physubr.c?r1=1.3&r2=1.4)
        miibus_if.m (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/miibus_if.m?r1=1.3&r2=1.4)
        miidevs (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/miidevs?r1=1.5&r2=1.6)
        miivar.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/miivar.h?r1=1.3&r2=1.4)
        mlphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/mlphy.c?r1=1.3&r2=1.4)
        nsgphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsgphy.c?r1=1.3&r2=1.4)
        nsgphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsgphyreg.h?r1=1.3&r2=1.4)
        nsphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsphy.c?r1=1.3&r2=1.4)
        nsphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/nsphyreg.h?r1=1.3&r2=1.4)
        pnaphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/pnaphy.c?r1=1.3&r2=1.4)
        qsphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/qsphy.c?r1=1.3&r2=1.4)
        qsphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/qsphyreg.h?r1=1.3&r2=1.4)
        rgephy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rgephy.c?r1=1.3&r2=1.4)
        rgephyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rgephyreg.h?r1=1.3&r2=1.4)
        rlphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rlphy.c?r1=1.3&r2=1.4)
        rlswitch.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/rlswitch.c?r1=1.3&r2=1.4)
        tdkphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tdkphy.c?r1=1.3&r2=1.4)
        tdkphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tdkphyreg.h?r1=1.3&r2=1.4)
        tlphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tlphy.c?r1=1.3&r2=1.4)
        tlphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/tlphyreg.h?r1=1.3&r2=1.4)
        ukphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ukphy.c?r1=1.3&r2=1.4)
        ukphy_subr.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ukphy_subr.c?r1=1.3&r2=1.4)
        xmphy.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/xmphy.c?r1=1.3&r2=1.4)
        xmphyreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/xmphyreg.h?r1=1.3&r2=1.4)

Removed Files:
-------------
    src/sys/dev/mii:
        exphy.c
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/exphy.c)
        inphy.c
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/inphy.c)
        inphyreg.h
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/inphyreg.h)
        ruephy.c
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ruephy.c)
        ruephyreg.h
        (http://cvsweb.midnightbsd.org/src/sys/dev/mii/ruephyreg.h)