CVS commit: src/sys/dev/pci

[Nick Hudson <skrll%netbsd.org@localhost>]

Module Name:    src
Committed By:   skrll
Date:           Fri Nov 18 16:42:22 UTC 2005

Modified Files:
        src/sys/dev/pci: if_iwi.c if_iwireg.h if_iwivar.h

Log Message:
Resolve conflicts. Changelog to follow.


To generate a diff of this commit:
cvs rdiff -r1.37 -r1.38 src/sys/dev/pci/if_iwi.c
cvs rdiff -r1.13 -r1.14 src/sys/dev/pci/if_iwireg.h
cvs rdiff -r1.7 -r1.8 src/sys/dev/pci/if_iwivar.h

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