thorpej
Tue Mar 25 18:05:38 PST 1997
Update of /cvsroot/src/sys/dev/ic
In directory netbsd1:/var/slash-tmp/cvs-serv14200

Log Message:
Update from Matt Thomas <matt@3am-software.com>.  Multicast-related
bug fixes.

Status:

Vendor Tag:	thomas
Release Tags:	pdq-970324
		
N src/sys/dev/ic/1666
C src/sys/dev/ic/pdq_ifsubr.c

1 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jthomas:yesterday -jthomas src/sys/dev/ic


thorpej
Tue Mar 25 18:08:08 PST 1997
Update of /cvsroot/src/sys/dev/ic
In directory netbsd1:/var/slash-tmp/cvs-serv14303

Modified Files:
	pdq_ifsubr.c 
Log Message:
Resolve conflicts from merge.