Module Name:	syssrc
Committed By:	sommerfeld
Date:		Wed May  3 14:42:32 UTC 2000

Modified Files:
	syssrc/sys/arch/i386/conf [sommerfeld_i386mp_1]: GENERIC INSTALL
	    files.i386
	syssrc/sys/arch/i386/i386 [sommerfeld_i386mp_1]: genassym.cf locore.s
	    pmap.c
	syssrc/sys/arch/i386/include [sommerfeld_i386mp_1]: pmap.h

Log Message:
Merge with -current


To generate a diff of this commit:
cvs rdiff -r1.300.2.4 -r1.300.2.5 syssrc/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.135.2.3 -r1.135.2.4 syssrc/sys/arch/i386/conf/INSTALL
cvs rdiff -r1.147.2.2 -r1.147.2.3 syssrc/sys/arch/i386/conf/files.i386
cvs rdiff -r1.17.10.1 -r1.17.10.2 syssrc/sys/arch/i386/i386/genassym.cf
cvs rdiff -r1.215.2.6 -r1.215.2.7 syssrc/sys/arch/i386/i386/locore.s
cvs rdiff -r1.83.2.4 -r1.83.2.5 syssrc/sys/arch/i386/i386/pmap.c
cvs rdiff -r1.43.2.1 -r1.43.2.2 syssrc/sys/arch/i386/include/pmap.h

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