From owner-cvs-sys  Sat Feb  8 07:14:10 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id HAA15943
          for cvs-sys-outgoing; Sat, 8 Feb 1997 07:14:10 -0800 (PST)
Received: (from joerg@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id HAA15936;
          Sat, 8 Feb 1997 07:14:06 -0800 (PST)
Date: Sat, 8 Feb 1997 07:14:06 -0800 (PST)
From: Joerg Wunsch <joerg>
Message-Id: <199702081514.HAA15936@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/conf files src/sys/net if_fddisubr.c src/sys/pci if_pdq.c pdq.c pdq_os.h pdqreg.h src/sys/i386/conf files.i386 src/sys/netinet if_fddi.h
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

joerg       97/02/08 07:14:05

  Branch:      sys/conf  RELENG_2_2
               sys/i386/conf  RELENG_2_2
               sys/net   RELENG_2_2
               sys/netinet  RELENG_2_2
               sys/pci   RELENG_2_2
  Modified:    sys/conf  files
               sys/i386/conf  files.i386
               sys/net   if_fddisubr.c
               sys/netinet  if_fddi.h
  Removed:     sys/pci   if_pdq.c pdq.c pdq_os.h pdqreg.h
  Log:
  Mega-merge from -current: bring in the FDDI driver update.
  
  OKed by:	davidg
  
  Revision  Changes    Path
  1.80.2.4  +5 -4      src/sys/conf/files
  1.141.2.6 +2 -1      src/sys/i386/conf/files.i386
  1.9.2.2   +171 -48   src/sys/net/if_fddisubr.c
  1.3.4.1   +7 -3      src/sys/netinet/if_fddi.h