Module Name:	syssrc
Committed By:	sommerfeld
Date:		Sun Jun 25 19:37:14 UTC 2000

Modified Files:
	syssrc/sys/arch/i386/conf [sommerfeld_i386mp_1]: GENERIC HYDRA INSTALL
	    files.i386
	syssrc/sys/arch/i386/eisa [sommerfeld_i386mp_1]: eisa_machdep.c
	syssrc/sys/arch/i386/i386 [sommerfeld_i386mp_1]: autoconf.c genassym.cf
	    locore.s machdep.c mainbus.c pmap.c trap.c vm_machdep.c
	syssrc/sys/arch/i386/include [sommerfeld_i386mp_1]: cpu.h
	    eisa_machdep.h intr.h pmap.h
	syssrc/sys/arch/i386/isa [sommerfeld_i386mp_1]: clock.c isa_machdep.c
	    npx.c
	syssrc/sys/arch/i386/pci [sommerfeld_i386mp_1]: pci_machdep.c

Log Message:
Merge up to just-post-1.5 -current


To generate a diff of this commit:
cvs rdiff -r1.300.2.5 -r1.300.2.6 syssrc/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.1.2.3 -r1.1.2.4 syssrc/sys/arch/i386/conf/HYDRA
cvs rdiff -r1.135.2.4 -r1.135.2.5 syssrc/sys/arch/i386/conf/INSTALL
cvs rdiff -r1.147.2.3 -r1.147.2.4 syssrc/sys/arch/i386/conf/files.i386
cvs rdiff -r1.10.22.1 -r1.10.22.2 syssrc/sys/arch/i386/eisa/eisa_machdep.c
cvs rdiff -r1.45.2.2 -r1.45.2.3 syssrc/sys/arch/i386/i386/autoconf.c
cvs rdiff -r1.17.10.2 -r1.17.10.3 syssrc/sys/arch/i386/i386/genassym.cf
cvs rdiff -r1.215.2.7 -r1.215.2.8 syssrc/sys/arch/i386/i386/locore.s
cvs rdiff -r1.376.2.3 -r1.376.2.4 syssrc/sys/arch/i386/i386/machdep.c
cvs rdiff -r1.29.2.2 -r1.29.2.3 syssrc/sys/arch/i386/i386/mainbus.c
cvs rdiff -r1.83.2.5 -r1.83.2.6 syssrc/sys/arch/i386/i386/pmap.c
cvs rdiff -r1.134.2.1 -r1.134.2.2 syssrc/sys/arch/i386/i386/trap.c
cvs rdiff -r1.86.2.2 -r1.86.2.3 syssrc/sys/arch/i386/i386/vm_machdep.c
cvs rdiff -r1.59.2.5 -r1.59.2.6 syssrc/sys/arch/i386/include/cpu.h
cvs rdiff -r1.5.16.1 -r1.5.16.2 syssrc/sys/arch/i386/include/eisa_machdep.h
cvs rdiff -r1.12.10.1 -r1.12.10.2 syssrc/sys/arch/i386/include/intr.h
cvs rdiff -r1.43.2.2 -r1.43.2.3 syssrc/sys/arch/i386/include/pmap.h
cvs rdiff -r1.63.2.1 -r1.63.2.2 syssrc/sys/arch/i386/isa/clock.c
cvs rdiff -r1.45.2.1 -r1.45.2.2 syssrc/sys/arch/i386/isa/isa_machdep.c
cvs rdiff -r1.70.8.2 -r1.70.8.3 syssrc/sys/arch/i386/isa/npx.c
cvs rdiff -r1.35.2.1 -r1.35.2.2 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.