NetBSD master CVS tree commits

[The Source of All Evil <source>]

thorpej
Mon Mar 11 13:41:37 PST 1996
Update of /a/cvsroot/src/sys/dev/ic
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv6406/ic

Modified Files:
        pdq.c pdq_ifsubr.c pdqreg.h pdqvar.h 
Log Message:
Resolve conflicts from merge.


thorpej
Mon Mar 11 13:41:39 PST 1996
Update of /a/cvsroot/src/sys/dev/pci
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv6406/pci

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