Yoshihiro Takahashi 382157f377 Merged from sys/i386/conf/GENERIC revision 1.304.		2001-05-06 05:57:46 +00:00
..
apm	Merged from sys/i386/i386/bioscall.s revision 1.9 and 1.10.	2001-04-01 07:08:13 +00:00
cbus	Merged from sys/isa/fd.c revision 1.193.	2001-05-06 05:49:11 +00:00
conf	Merged from sys/i386/conf/GENERIC revision 1.304.	2001-05-06 05:57:46 +00:00
i386	Merged the rest of changes in sys/i386/i386/machdep.c revision 1.447.	2001-05-02 13:48:39 +00:00
pc98	Merged from sys/isa/fd.c revision 1.193.	2001-05-06 05:49:11 +00:00