Merge of NetBSD 960317
authorniklas <niklas@openbsd.org>
Thu, 18 Apr 1996 18:55:32 +0000 (18:55 +0000)
committerniklas <niklas@openbsd.org>
Thu, 18 Apr 1996 18:55:32 +0000 (18:55 +0000)
commitf97e905a3ac479bfc7685c0e5722042c4b899925
tree9bbcf466a96cee11c19aefcabab59b0d4a423258
parent86941b9bdc3cb04656cda89c03e3a06dee42859e
Merge of NetBSD 960317
sys/arch/i386/conf/DISKLESS
sys/arch/i386/conf/GENERIC
sys/arch/i386/conf/GENERICADP
sys/arch/i386/conf/GENERICOTHER
sys/arch/i386/conf/HELIOS_PCMCIA
sys/arch/i386/conf/INSTADP
sys/arch/i386/conf/Makefile.i386
sys/arch/i386/conf/NETTAN [new file with mode: 0644]
sys/arch/i386/conf/TDR
sys/arch/i386/conf/files.i386
sys/arch/i386/eisa/eisa_machdep.h [new file with mode: 0644]