Module Name:	syssrc
Committed By:	sommerfeld
Date:		Fri Mar 16 05:00:49 UTC 2001

Modified Files:
	syssrc/sys/arch/i386/conf [sommerfeld_i386mp_1]: files.i386
	syssrc/sys/arch/i386/i386 [sommerfeld_i386mp_1]: genassym.cf machdep.c
	    pmap.c trap.c

Log Message:
Merge branch with -current; top of branch + current builds a working
GENERIC.MP again.


To generate a diff of this commit:
cvs rdiff -r1.147.2.10 -r1.147.2.11 syssrc/sys/arch/i386/conf/files.i386
cvs rdiff -r1.17.10.9 -r1.17.10.10 syssrc/sys/arch/i386/i386/genassym.cf
cvs rdiff -r1.376.2.18 -r1.376.2.19 syssrc/sys/arch/i386/i386/machdep.c
cvs rdiff -r1.83.2.31 -r1.83.2.32 syssrc/sys/arch/i386/i386/pmap.c
cvs rdiff -r1.134.2.13 -r1.134.2.14 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.