]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Merge from the following changes.
authornyan <nyan@FreeBSD.org>
Tue, 11 Jul 2000 12:50:34 +0000 (12:50 +0000)
committernyan <nyan@FreeBSD.org>
Tue, 11 Jul 2000 12:50:34 +0000 (12:50 +0000)
commitb5738d479e0eaad924b34c5d0b2d67227187006f
treecc0ed6121e6e56a5498b37cea5f448af592d36c6
parent7716c5370ad4c724650bb6def35750d561bc11d2
Merge from the following changes.

sys/conf/files.i386 1.321
sys/dev/syscons/syscons.c 1.343
sys/i386/isa/spkr.c 1.46
sys/isa/fd.c 1.183 and 1.185
sys/isa/syscons_isa.c 1.14
sys/isa/vga_isa.c 1.18
sys/conf/files.pc98
sys/pc98/cbus/fdc.c
sys/pc98/cbus/gdc.c
sys/pc98/cbus/syscons_cbus.c
sys/pc98/pc98/fd.c
sys/pc98/pc98/pc98gdc.c
sys/pc98/pc98/spkr.c
sys/pc98/pc98/syscons.c
sys/pc98/pc98/syscons_pc98.c