From owner-cvs-sys  Tue Oct  3 13:01:29 1995
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id NAA19128
          for cvs-sys-outgoing; Tue, 3 Oct 1995 13:01:29 -0700
Received: (from wollman@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id NAA19112
          ; Tue, 3 Oct 1995 13:01:11 -0700
Date: Tue, 3 Oct 1995 13:01:11 -0700
From: "Garrett A. Wollman" <wollman>
Message-Id: <199510032001.NAA19112@freefall.freebsd.org>
To: CVS-commiters, cvs-sys
Subject: cvs commit: src/sys/net - Imported sources
Sender: owner-cvs-sys@FreeBSD.org
Precedence: bulk

wollman     95/10/03 13:01:10

  Branch:      sys/net   1.1.1
  Log:
  Import of 4.4-Lite-2 sys/net to make merge and examination easier.  Since we
  are not on the vendor branch for any of these files, the conflicts shown make
  no matter.
  
  Obtained from:	4.4BSD-Lite-2
  
  Status:
  
  Vendor Tag:	CSRG
  Release Tags:	bsd_44_lite_2
  
  C src/sys/net/bpf.c
  U src/sys/net/slip.h
  U src/sys/net/slcompress.h
  U src/sys/net/slcompress.c
  C src/sys/net/rtsock.c
  C src/sys/net/route.h
  C src/sys/net/route.c
  U src/sys/net/raw_usrreq.c
  U src/sys/net/raw_cb.h
  U src/sys/net/raw_cb.c
  C src/sys/net/radix.h
  C src/sys/net/radix.c
  U src/sys/net/netisr.h
  C src/sys/net/if_types.h
  C src/sys/net/if_slvar.h
  C src/sys/net/if_sl.c
  C src/sys/net/if_loop.c
  U src/sys/net/if_llc.h
  U src/sys/net/if_ethersubr.c
  U src/sys/net/if_dl.h
  U src/sys/net/if_arp.h
  C src/sys/net/if.h
  C src/sys/net/if.c
  U src/sys/net/bpfdesc.h
  U src/sys/net/bpf_filter.c
  U src/sys/net/bpf_compat.h
  C src/sys/net/bpf.h
  I src/sys/net/tags
  
  13 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jCSRG:yesterday -jCSRG src/sys/net