Yoshihiro Takahashi 8b838a7ac2 Merge from the following changes. ... File Revision sys/conf/files.i386 1.303 and 1.304 sys/dev/kbd/atkbd.c 1.23 sys/dev/syscons/scterm-sc.c 1.2 sys/dev/syscons/scvgarndr.c 1.5 sys/dev/syscons/scvtb.c 1.5 sys/dev/syscons/syscons.c 1.335 sys/isa/syscons_isa.c 1.11 sys/isa/vga_isa.c 1.17		2000-03-29 12:26:41 +00:00
..
cbus	Merge from the following changes.	2000-03-29 12:26:41 +00:00
conf	Added the joy driver (commented out).	2000-03-22 03:19:37 +00:00
i386	Merged from sys/i386/i386/userconfig.c revision 1.179.	2000-03-28 15:07:28 +00:00
pc98	Merge from the following changes.	2000-03-29 12:26:41 +00:00