From owner-cvs-all  Fri Dec 17 23:47:36 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id A70AF14D8F; Fri, 17 Dec 1999 23:47:34 -0800 (PST)
	(envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id XAA35692;
	Fri, 17 Dec 1999 23:47:34 -0800 (PST)
	(envelope-from imp@FreeBSD.org)
Message-Id: <199912180747.XAA35692@freefall.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 17 Dec 1999 23:47:34 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/i386/conf PCCARD NEWCARD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

imp         1999/12/17 23:47:34 PST

  Modified files:
    sys/i386/conf        PCCARD NEWCARD 
  Log:
  Merge GENERIC into PCCARD
  Merge PCCARD into NEWCARD
  
  Revision  Changes    Path
  1.32      +16 -12    src/sys/i386/conf/PCCARD
  1.8       +47 -39    src/sys/i386/conf/NEWCARD



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message