NetBSD master CVS tree commits

[The Source of All Evil <source%NetBSD.ORG@localhost>]

veego
Sun May 17 10:00:15 PDT 1998
Update of /cvsroot/src/sys/lkm/netinet/if_ipl
In directory nb00:/tmp/cvs-serv26635

Modified Files:
        ipl.h 
Log Message:
Resolve conflicts

veego
Sun May 17 10:07:26 PDT 1998
Update of /cvsroot/src/sys/netinet
In directory nb00:/tmp/cvs-serv26663

Modified Files:
        fil.c ip_auth.c ip_compat.h ip_fil.c ip_fil.h ip_log.c 
        ip_nat.c ip_proxy.c ip_proxy.h ip_state.c 
Log Message:
Resolve conflicts

hpeyerl
Sun May 17 10:09:55 PDT 1998
Update of /cvsroot/src/sys/arch/hp300/dev
In directory nb00:/tmp/cvs-serv26728

Modified Files:
        st.c 
Log Message:
Add the HP35470A DAT drive.