mrg
Sun Feb 23 02:08:32 PST 1997
Update of /cvsroot/src/sys/vm
In directory netbsd1:/var/slash-tmp/vm

Log Message:
lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite2
		
U src/sys/vm/TODO
C src/sys/vm/vnode_pager.c
C src/sys/vm/vm_user.c
C src/sys/vm/vm_unix.c
C src/sys/vm/vm_swap.c
C src/sys/vm/vm_prot.h
C src/sys/vm/vm_param.h
C src/sys/vm/vm_pager.h
C src/sys/vm/vm_pager.c
C src/sys/vm/vm_pageout.h
C src/sys/vm/vm_pageout.c
C src/sys/vm/vm_page.h
C src/sys/vm/vm_page.c
C src/sys/vm/vm_object.h
C src/sys/vm/vm_object.c
C src/sys/vm/vm_mmap.c
C src/sys/vm/vm_meter.c
C src/sys/vm/vm_map.h
C src/sys/vm/vm_map.c
C src/sys/vm/vm_kern.h
C src/sys/vm/vm_kern.c
C src/sys/vm/vm_init.c
C src/sys/vm/vm_inherit.h
C src/sys/vm/vm.h
C src/sys/vm/vm_glue.c
C src/sys/vm/vm_fault.c
C src/sys/vm/vm_extern.h
I src/sys/vm/tags
C src/sys/vm/swap_pager.h
C src/sys/vm/swap_pager.c
C src/sys/vm/pmap.h
C src/sys/vm/device_pager.h
C src/sys/vm/device_pager.c
C src/sys/vm/vnode_pager.h

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

	cvs checkout -jCSRG:yesterday -jCSRG src/sys/vm