From owner-cvs-all@FreeBSD.ORG  Sun Nov  6 19:39:41 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AF6BF16A41F;
	Sun,  6 Nov 2005 19:39:41 +0000 (GMT)
	(envelope-from wpaul@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 67E4643D48;
	Sun,  6 Nov 2005 19:39:41 +0000 (GMT)
	(envelope-from wpaul@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA6Jdff9011581;
	Sun, 6 Nov 2005 19:39:41 GMT
	(envelope-from wpaul@repoman.freebsd.org)
Received: (from wpaul@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA6JdfHq011580;
	Sun, 6 Nov 2005 19:39:41 GMT (envelope-from wpaul)
Message-Id: <200511061939.jA6JdfHq011580@repoman.freebsd.org>
From: Bill Paul <wpaul@FreeBSD.org>
Date: Sun, 6 Nov 2005 19:39:41 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/compat/ndis ntoskrnl_var.h subr_hal.c
 subr_ntoskrnl.c src/sys/dev/if_ndis if_ndis.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2005 19:39:41 -0000

wpaul       2005-11-06 19:39:41 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/compat/ndis      ntoskrnl_var.h subr_hal.c subr_ntoskrnl.c 
    sys/dev/if_ndis      if_ndis.c 
  Log:
  MFC: merge changes from head to pacify Intel 2200BG/2915/ABG driver.
  
  Revision  Changes    Path
  1.36.2.2  +1 -0      src/sys/compat/ndis/ntoskrnl_var.h
  1.24.2.2  +26 -5     src/sys/compat/ndis/subr_hal.c
  1.71.2.3  +33 -0     src/sys/compat/ndis/subr_ntoskrnl.c
  1.99.2.5  +6 -7      src/sys/dev/if_ndis/if_ndis.c