Module Name:	syssrc
Committed By:	sommerfeld
Date:		Mon Jun 18 04:49:06 UTC 2001

Modified Files:
	syssrc/sys/arch/i386/conf [sommerfeld_i386mp_1]: files.i386
	syssrc/sys/arch/i386/i386 [sommerfeld_i386mp_1]: db_interface.c
	    mptramp.s process_machdep.c trap.c

Log Message:
Complete merge with -current


To generate a diff of this commit:
cvs rdiff -r1.147.2.13 -r1.147.2.14 syssrc/sys/arch/i386/conf/files.i386
cvs rdiff -r1.30.2.4 -r1.30.2.5 syssrc/sys/arch/i386/i386/db_interface.c
cvs rdiff -r1.1.2.5 -r1.1.2.6 syssrc/sys/arch/i386/i386/mptramp.s
cvs rdiff -r1.30.10.5 -r1.30.10.6 syssrc/sys/arch/i386/i386/process_machdep.c
cvs rdiff -r1.134.2.16 -r1.134.2.17 syssrc/sys/arch/i386/i386/trap.c

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