From owner-freebsd-commit  Tue Oct 31 12:07:50 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA20720
          for freebsd-commit-outgoing; Tue, 31 Oct 1995 12:07:50 -0800
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA20706
          for cvs-all-outgoing; Tue, 31 Oct 1995 12:07:47 -0800
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA20694
          for cvs-sys-outgoing; Tue, 31 Oct 1995 12:07:41 -0800
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id MAA20684
          ; Tue, 31 Oct 1995 12:07:33 -0800
Date: Tue, 31 Oct 1995 12:07:33 -0800
From: Peter Wemm <peter>
Message-Id: <199510312007.MAA20684@freefall.freebsd.org>
To: CVS-commiters, cvs-sys
Subject: cvs commit: src/sys/net - Imported sources
Sender: owner-commit@FreeBSD.org
Precedence: bulk

peter       95/10/31 12:07:33 (peter/633/peter)

  Branch:      sys/net   1.1.2
  Log:
  Import the FreeBSD specific kernel parts of the ppp-2.2 package..
  
  This is the unmodified files vendor branch import, the working stuff
  will follow shortly..
  
  Status:
  
  Vendor Tag:	MACKERAS
  Release Tags:	ppp_2_2
  
  C src/sys/net/if_ppp.h
  N src/sys/net/ppp_tty.c
  N src/sys/net/if_pppvar.h
  C src/sys/net/if_ppp.c
  N src/sys/net/ppp_comp.h
  N src/sys/net/ppp_defs.h
  N src/sys/net/bsd_comp.c
  
  2 conflicts created by this import.
  Use the following command to help the merge:
  
  	ccvs checkout -jMACKERAS:yesterday -jMACKERAS src/sys/net