Module Name:	syssrc
Committed By:	scottr
Date:		Sun Nov 28 10:21:15 UTC 1999

Modified Files:
	syssrc/sys/arch/mac68k/conf [scottr-mac68k-wscons]: GENERIC std.mac68k
	syssrc/sys/arch/mac68k/include [scottr-mac68k-wscons]: svr4_machdep.h
	syssrc/sys/arch/mac68k/mac68k [scottr-mac68k-wscons]: bus_space.c
	    machdep.c mem.c pmap.c trap.c vm_machdep.c
Removed Files:
	syssrc/sys/arch/mac68k/conf [scottr-mac68k-wscons]: GENERIC.v6

Log Message:
Sync with main branch.


To generate a diff of this commit:
cvs rdiff -r1.85.2.11 -r1.85.2.12 syssrc/sys/arch/mac68k/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/mac68k/conf/GENERIC.v6
cvs rdiff -r1.21.8.2 -r1.21.8.3 syssrc/sys/arch/mac68k/conf/std.mac68k
cvs rdiff -r1.2.2.1 -r1.2.2.2 syssrc/sys/arch/mac68k/include/svr4_machdep.h
cvs rdiff -r1.3.2.2 -r1.3.2.3 syssrc/sys/arch/mac68k/mac68k/bus_space.c
cvs rdiff -r1.223.2.7 -r1.223.2.8 syssrc/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -r1.19.2.1 -r1.19.2.2 syssrc/sys/arch/mac68k/mac68k/mem.c
cvs rdiff -r1.48.2.3 -r1.48.2.4 syssrc/sys/arch/mac68k/mac68k/pmap.c
cvs rdiff -r1.68.2.2 -r1.68.2.3 syssrc/sys/arch/mac68k/mac68k/trap.c
cvs rdiff -r1.33.2.3 -r1.33.2.4 syssrc/sys/arch/mac68k/mac68k/vm_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.