Module Name:	syssrc
Committed By:	sommerfeld
Date:		Wed May 23 03:13:39 UTC 2001

Modified Files:
	syssrc/sys/arch/i386/conf [sommerfeld_i386mp_1]: GENERIC.MP
	    GENERIC.MPDEBUG Makefile.i386
	syssrc/sys/arch/i386/eisa [sommerfeld_i386mp_1]: eisa_machdep.c
	syssrc/sys/arch/i386/i386 [sommerfeld_i386mp_1]: locore.s machdep.c
	    microtime.s svr4_sigcode.s
	syssrc/sys/arch/i386/include [sommerfeld_i386mp_1]: apmvar.h intr.h
	syssrc/sys/arch/i386/isa [sommerfeld_i386mp_1]: npx.c
	syssrc/sys/arch/i386/pci [sommerfeld_i386mp_1]: pci_machdep.c

Log Message:
Merge branch with tonight's current.
boots multiuser.


To generate a diff of this commit:
cvs rdiff -r1.1.2.4 -r1.1.2.5 syssrc/sys/arch/i386/conf/GENERIC.MP
cvs rdiff -r1.1.2.1 -r1.1.2.2 syssrc/sys/arch/i386/conf/GENERIC.MPDEBUG
cvs rdiff -r1.108.2.1 -r1.108.2.2 syssrc/sys/arch/i386/conf/Makefile.i386
cvs rdiff -r1.10.22.4 -r1.10.22.5 syssrc/sys/arch/i386/eisa/eisa_machdep.c
cvs rdiff -r1.215.2.23 -r1.215.2.24 syssrc/sys/arch/i386/i386/locore.s
cvs rdiff -r1.376.2.22 -r1.376.2.23 syssrc/sys/arch/i386/i386/machdep.c
cvs rdiff -r1.18.18.1 -r1.18.18.2 syssrc/sys/arch/i386/i386/microtime.s
cvs rdiff -r1.1.4.2 -r1.1.4.3 syssrc/sys/arch/i386/i386/svr4_sigcode.s
cvs rdiff -r1.9.10.2 -r1.9.10.3 syssrc/sys/arch/i386/include/apmvar.h
cvs rdiff -r1.12.10.13 -r1.12.10.14 syssrc/sys/arch/i386/include/intr.h
cvs rdiff -r1.70.8.12 -r1.70.8.13 syssrc/sys/arch/i386/isa/npx.c
cvs rdiff -r1.35.2.6 -r1.35.2.7 syssrc/sys/arch/i386/pci/pci_machdep.c

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