From owner-cvs-sys Fri Jan 17 15:19:53 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id PAA04134 for cvs-sys-outgoing; Fri, 17 Jan 1997 15:19:53 -0800 (PST) Received: (from joerg@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id PAA04123; Fri, 17 Jan 1997 15:19:50 -0800 (PST) Date: Fri, 17 Jan 1997 15:19:50 -0800 (PST) From: Joerg Wunsch Message-Id: <199701172319.PAA04123@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys - Imported sources Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk joerg 97/01/17 15:19:49 src/sys - Imported sources Update of /home/ncvs/src/sys In directory freefall.freebsd.org:/a/joerg/sys Revision/Branch: 1.1.1 Log Message: Finally import the 960801 of Matt Thomas' DEC FDDI driver. I'm importing it onto a vendor branch first, in the hope that this will make future maintenance easier. The conflicts are (hopefully) unimportant. More commits that actually bring this into the source tree will follow. Submitted by: Matt Thomas (thomas@lkg.dec.com) Status: Vendor Tag: MATT_THOMAS Release Tags: v960801 C src/sys/net/if_fddisubr.c C src/sys/netinet/if_fddi.h N src/sys/dev/pdq/pdq.c N src/sys/dev/pdq/pdq_ifsubr.c N src/sys/dev/pdq/pdqvar.h N src/sys/dev/pdq/pdqreg.h N src/sys/i386/eisa/if_fea.c N src/sys/pci/if_fpa.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jMATT_THOMAS:yesterday -jMATT_THOMAS src/sys