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

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/dev/amr:
        amr.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amr.c?r1=1.3&r2=1.4)
        amr_cam.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amr_cam.c?r1=1.3&r2=1.4)
        amr_disk.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amr_disk.c?r1=1.3&r2=1.4)
        amr_linux.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amr_linux.c?r1=1.5&r2=1.6)
        amr_pci.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amr_pci.c?r1=1.3&r2=1.4)
        amr_tables.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amr_tables.h?r1=1.3&r2=1.4)
        amrio.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amrio.h?r1=1.3&r2=1.4)
        amrreg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amrreg.h?r1=1.3&r2=1.4)
        amrvar.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/amr/amrvar.h?r1=1.3&r2=1.4)