Module Name:	src
Committed By:	skrll
Date:		Fri Nov 18 16:48:32 UTC 2005

Modified Files:
	src/sys/dev/ic: ath.c athrate-amrr.c athrate-onoe.c athrate-sample.c
	    athvar.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.60 -r1.61 src/sys/dev/ic/ath.c
cvs rdiff -r1.4 -r1.5 src/sys/dev/ic/athrate-amrr.c \
    src/sys/dev/ic/athrate-sample.c
cvs rdiff -r1.5 -r1.6 src/sys/dev/ic/athrate-onoe.c
cvs rdiff -r1.13 -r1.14 src/sys/dev/ic/athvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.