From owner-p4-projects@FreeBSD.ORG  Wed Nov 12 10:54:37 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B72B316A4D0; Wed, 12 Nov 2003 10:54:37 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9211316A4CE
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 10:54:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0EE2643F3F
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 10:54:37 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hACIsaXJ008372
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 10:54:36 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hACIsaLv008369
	for perforce@freebsd.org; Wed, 12 Nov 2003 10:54:36 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 12 Nov 2003 10:54:36 -0800 (PST)
Message-Id: <200311121854.hACIsaLv008369@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42149 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2003 18:54:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=42149

Change 42149 by sam@sam_ebb on 2003/11/12 10:53:46

	IFC

Affected files ...

.. //depot/projects/netperf/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#7 integrate

Differences ...

==== //depot/projects/netperf/sys/dev/bge/if_bge.c#12 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.57 2003/10/31 18:31:57 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.58 2003/11/11 17:57:03 sam Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.57 2003/10/31 18:31:57 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.58 2003/11/11 17:57:03 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>

==== //depot/projects/netperf/sys/dev/bge/if_bgereg.h#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.24 2003/10/31 16:25:39 wpaul Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.25 2003/11/11 17:57:03 sam Exp $
  */
 
 /*