KATO Takenori 499438b356 Merged from sys/i386/isa/npx.c revision 1.106.		2001-07-19 09:07:19 +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	Fixed conflict with sys/dev/syscons/syscons.h.	2001-07-14 08:07:26 +00:00
compile	Don't need the .keep_me files. Obrien and I committed past each other.	2001-07-01 23:35:44 +00:00
conf	Merged from sys/i386/conf/GENERIC revision 1.313.	2001-07-14 02:45:53 +00:00
i386	Merged from sys/i386/i386/machdep.c revisions 1.462 and 1.464.	2001-07-19 08:51:08 +00:00
pc98	Merged from sys/i386/isa/npx.c revision 1.106.	2001-07-19 09:07:19 +00:00