Yoshihiro Takahashi 6ffb65e8b1 Merged from the following changes. ... sys/conf/Makefile.i386 1.211 sys/conf/files.i386 1.329 sys/isa/fd.c 1.186, 1.188 and 1.189 sys/isa/sio.c 1.305 and 1.317 sys/i386/conf/GENERIC 1.270, 1.281, 1.282 and 1.284 sys/i386/i386/machdep.c 1.419 sys/i386/i386/userconfig.c 1.184		2000-11-05 14:31:19 +00:00
..
machdep.c	Merged from the following changes.	2000-11-05 14:31:19 +00:00
userconfig.c	Merged from the following changes.	2000-11-05 14:31:19 +00:00