From owner-cvs-etc  Tue Dec 16 18:01:32 1997
Return-Path: <owner-cvs-etc>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id SAA23934
          for cvs-etc-outgoing; Tue, 16 Dec 1997 18:01:32 -0800 (PST)
          (envelope-from owner-cvs-etc)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id SAA23846;
          Tue, 16 Dec 1997 18:00:40 -0800 (PST)
          (envelope-from pst@FreeBSD.org)
From: Paul Traina <pst@FreeBSD.ORG>
Received: (from pst@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id RAA20906;
	Tue, 16 Dec 1997 17:57:58 -0800 (PST)
Date: Tue, 16 Dec 1997 17:57:58 -0800 (PST)
Message-Id: <199712170157.RAA20906@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-etc@FreeBSD.ORG
Subject: cvs commit: src/etc pccard.conf.sample pccard_ether
Sender: owner-cvs-etc@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

pst         1997/12/16 17:57:58 PST

  Modified files:        (Branch: RELENG_2_2)
    etc                  pccard.conf.sample pccard_ether 
  Log:
  Merge from -current
  
  Revision  Changes    Path
  1.4.2.4   +37 -1     src/etc/pccard.conf.sample
  1.2.4.4   +9 -1      src/etc/pccard_ether