thorpej
Fri Jun  6 16:10:26 PDT 1997
Update of /cvsroot/src/sys/vm
In directory netbsd1:/var/slash-tmp/cvs-serv21832

Modified Files:
	vm_page.c vm_page.h 
Log Message:
Pull thorpej-bus-dma branch into mainline.


thorpej
Fri Jun  6 16:12:53 PDT 1997
Update of /cvsroot/src/sys/arch/i386/eisa
In directory netbsd1:/var/slash-tmp/cvs-serv22112

Modified Files:
	eisa_machdep.c eisa_machdep.h 
Log Message:
Pull thorpej-bus-dma branch into mainline.

mellon
Fri Jun  6 16:14:21 PDT 1997
Update of /cvsroot/src/sys/dev/ic
In directory netbsd1:/var/slash-tmp/cvs-serv22253

Modified Files:
	dc21040reg.h 
Log Message:
Clean up conflicts during merge (thomas de-970603)

thorpej
Fri Jun  6 16:14:23 PDT 1997
Update of /cvsroot/src/sys/arch/i386/i386
In directory netbsd1:/var/slash-tmp/cvs-serv22243

Modified Files:
	machdep.c mainbus.c pmap.c 
Log Message:
Pull thorpej-bus-dma branch into mainline.

veego
Fri Jun  6 16:14:38 PDT 1997
Update of /cvsroot/src/sys/kern
In directory netbsd1:/var/slash-tmp/cvs-serv22224/src/sys/kern

Modified Files:
	kern_sysctl.c 
Log Message:
Add HW_MACHINE_ARCH for the new sysctl hw.machine_arch which contains the
cpu class of a machine.


veego
Fri Jun  6 16:14:39 PDT 1997
Update of /cvsroot/src/sys/sys
In directory netbsd1:/var/slash-tmp/cvs-serv22224/src/sys/sys

Modified Files:
	sysctl.h 
Log Message:
Add HW_MACHINE_ARCH for the new sysctl hw.machine_arch which contains the
cpu class of a machine.


mellon
Fri Jun  6 16:15:02 PDT 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv22303

Modified Files:
	if_de.c if_devar.h 
Log Message:
Clean up conflicts during merge (thomas de-970603)

veego
Fri Jun  6 16:15:28 PDT 1997
Update of /cvsroot/src/sys/arch/m68k/conf
In directory netbsd1:/var/slash-tmp/cvs-serv22378/src/sys/arch/m68k/conf

Modified Files:
	files.m68k 
Log Message:
add src/sys/arch/m68k/m68k/m68k_machdep.c