From owner-cvs-all  Mon Apr  1 21:39:13 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id BD44D37B420; Mon,  1 Apr 2002 21:39:07 -0800 (PST)
Received: (from imp@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g325d7O70849;
	Mon, 1 Apr 2002 21:39:07 -0800 (PST)
	(envelope-from imp)
Message-Id: <200204020539.g325d7O70849@freefall.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 1 Apr 2002 21:39:07 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/dev/pccard pccarddevs
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

imp         2002/04/01 21:39:07 PST

  Modified files:
    sys/dev/pccard       pccarddevs 
  Log:
  Merge from both NetBSD and OpenBSD's pcmciadevs:
  NetBSD:
          1.163; martin; ELSA MicroLink mc all
          1.162; is; typo
          1.161; is; typo
          1.160; is; Add Lantech Fastnet/TX
  OpenBSD:
          1.85; millert; proxim rangelan-ds
          1.84; provos; linksys wpc11
          1.83; mickey; now wires needed wlan
          1.82; mickey; socket low power wlan from netbsd [*]
          1.81; mickey; ericsson wlan
          1.80; fgsch; add openbsd tag back (not needed)
          1.79; fgsch; Netgear FA411
          1.78; mickey; simple spectrum25 from netbsd [*]
          1.77; mickey; emtac wavelan from netbsd [*]
          1.76; mickey; buffalo wavelans from netbsd [*]
          1.75; jakob; 3com wilress lan pccard
          1.74; mickey; linksys2 instant wireless
          1.73; mickey; oops (add closing quote)
          1.72; mickey; pcm100
  [*] (already in freebsd)
  
  Obtained from: NetBSD, OpenBSD
  
  Revision  Changes    Path
  1.29      +17 -6     src/sys/dev/pccard/pccarddevs

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