mark
Thu Oct 16 23:34:03 PDT 1997
Update of /cvsroot/src/sys/arch/arm32/arm32
In directory netbsd1:/var/slash-tmp/cvs-serv14452

Modified Files:
	machdep.c 
Log Message:
Include vm/vm.h


mrg
Thu Oct 16 23:34:26 PDT 1997
Update of /cvsroot/src/usr.sbin/pstat
In directory netbsd1:/var/slash-tmp/cvs-serv14528

Modified Files:
	pstat.8 pstat.c 
Log Message:
merge lite-2

mrg
Thu Oct 16 23:37:02 PDT 1997
Update of /cvsroot/src/usr.sbin/quot
In directory netbsd1:/home/mrg/lite2/quot

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
cvs: ERROR: Check-in of /cvsroot/src/usr.sbin/quot/quot.8,v failed

No conflicts created by this import


mrg
Thu Oct 16 23:37:36 PDT 1997
Update of /cvsroot/src/usr.sbin/quot
In directory netbsd1:/home/mrg/lite2/quot

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/quot/quot.8

1 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/quot