Module Name: src Committed By: cegger Date: Sun Aug 29 21:14:16 UTC 2010
Modified Files:
src/sys/dev/ieee1394: sbp.h
Log Message:
Confilict -> Conflict
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ieee1394/sbp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
