From owner-cvs-sys  Mon Mar 11 11:12:53 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA04613
          for cvs-sys-outgoing; Mon, 11 Mar 1996 11:12:53 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA04598
          Mon, 11 Mar 1996 11:12:48 -0800 (PST)
Date: Mon, 11 Mar 1996 11:12:48 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199603111912.LAA04598@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/conf - Imported sources
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       96/03/11 11:12:48

  src/sys/conf - Imported sources
  Update of /home/ncvs/src/sys/conf
  In directory freefall.freebsd.org:/tmp/cvs-serv4332
  
  Revision/Branch: 1.1.1
  
  Log Message:
  Import 4.4BSD-Lite2 onto the vendor branch, note that in the kernel, all
  files are off the vendor branch, so this should not change anything.
  
  A "U" marker generally means that the file was not changed in between
  the 4.4Lite and Lite-2 releases, and does not need a merge.  "C" generally
  means that there was a change.
  
  Status:
  
  Vendor Tag:	CSRG
  Release Tags:	bsd_44_lite_2
  		
  U src/sys/conf/defines
  C src/sys/conf/files
  U src/sys/conf/files.newconf
  U src/sys/conf/newvers.sh
  U src/sys/conf/nfsswapvmunix.c
  C src/sys/conf/param.c
  U src/sys/conf/systags.sh
  
  2 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jCSRG:yesterday -jCSRG src/sys/conf