From owner-cvs-src@FreeBSD.ORG  Sun Jul  6 06:17:49 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55067106576B;
	Sun,  6 Jul 2008 06:17:49 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E2408FC0C;
	Sun,  6 Jul 2008 06:17:49 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m666Hng4057368;
	Sun, 6 Jul 2008 06:17:49 GMT (envelope-from imp@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m666HndS057367;
	Sun, 6 Jul 2008 06:17:49 GMT (envelope-from imp@repoman.freebsd.org)
Message-Id: <200807060617.m666HndS057367@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	imp@repoman.freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 6 Jul 2008 06:17:39 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/dev/pccard pccarddevs
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jul 2008 06:17:49 -0000

imp         2008-07-06 06:17:39 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/pccard       pccarddevs 
  Log:
  SVN rev 180314 on 2008-07-06 06:17:39Z by imp
  
  Merge from NetBSD's pcmciadev file (rev ~1.208 - 1.226) where
  appropriate (versions not appropriate to merge omitted):
  o 1.226 imp nop, save for NetBSD string (minor merging the other way)
  o 1.225 jnemeth Coreage LAPCCTXD
  o 1.224 martin (remove 3rd and 4th clauses)
  o 1.223 kiyohara (TDK bluetooth PC Card)
  o 1.222 kiyohara (Anycom BlueCard)
  o 1.221 ichiro (NEC Infrontia AX420N)
  o 1.219 jmcneill (EDIMAX EP-4101)
  o 1.213 tsutsui (TEAC IDECARDII entry fix)
  
  Also, while I'm here, fix some tab problems that have crept in.
  
  Revision  Changes    Path
  1.132     +28 -25    src/sys/dev/pccard/pccarddevs