Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 03/29/1997 01:50:02
Fri Mar 28 17:42:36 PST 1997
Update of /cvsroot/src/sys/lkm/netinet/if_ipl
In directory netbsd1:/var/slash-tmp/cvs-serv1058

Modified Files:
	Makefile ipl.h mln_ipl.c 
Log Message:
Resolve conflicts from merge.
XXX doesn't compile yet, but that will require some other changes, which
XXX I want to make separately.