KATO Takenori a3066f74e6 Merge form sys/i386/conf/GENERIC revision 1.195.		1999-10-16 13:11:49 +00:00
..
boot	$Id$ -> $FreeBSD$	1999-08-28 01:08:13 +00:00
cbus	Merge from sys/isa/fd.c revision 1.146, 1.153, 1.154 and 1.159.	1999-09-27 03:32:31 +00:00
conf	Merge form sys/i386/conf/GENERIC revision 1.195.	1999-10-16 13:11:49 +00:00
i386	Sync with sys/i386/i386/machdep.c revision 1.370.	1999-10-13 11:03:41 +00:00
pc98	Sync with sys/i386/isa/pcaudio.c revision 1.55.	1999-10-13 11:07:16 +00:00