Log Message:
-----------
merge
Modified Files:
--------------
src/sys/dev/arcmsr:
arcmsr.c (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/sys/dev/arcmsr/arcmsr.c?r1=1.3&r2=1.4)
arcmsr.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/sys/dev/arcmsr/arcmsr.h?r1=1.4&r2=1.5)