Module Name:	src
Committed By:	thorpej
Date:		Sat Jan 18 07:14:22 UTC 2003

Modified Files:
	src/sys/arch/x68k/include: Makefile cpu.h param.h
	src/sys/arch/x68k/x68k: genassym.cf locore.s machdep.c trap.c
Added Files:
	src/sys/arch/x68k/include: mcontext.h

Log Message:
Merge the nathanw_sa branch.


To generate a diff of this commit:
cvs rdiff -r1.24 -r1.25 src/sys/arch/x68k/include/Makefile
cvs rdiff -r1.27 -r1.28 src/sys/arch/x68k/include/cpu.h
cvs rdiff -r0 -r1.2 src/sys/arch/x68k/include/mcontext.h
cvs rdiff -r1.17 -r1.18 src/sys/arch/x68k/include/param.h
cvs rdiff -r1.20 -r1.21 src/sys/arch/x68k/x68k/genassym.cf
cvs rdiff -r1.67 -r1.68 src/sys/arch/x68k/x68k/locore.s
cvs rdiff -r1.110 -r1.111 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -r1.59 -r1.60 src/sys/arch/x68k/x68k/trap.c

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