From owner-p4-projects@FreeBSD.ORG  Mon Mar 24 22:21:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AAAA11065680; Mon, 24 Mar 2008 22:21:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3AF001065676
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 22:21:04 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CA168FC26
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 22:21:04 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OML3Wa079266
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 22:21:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OML3mD079264
	for perforce@freebsd.org; Mon, 24 Mar 2008 22:21:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 24 Mar 2008 22:21:03 GMT
Message-Id: <200803242221.m2OML3mD079264@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138480 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 24 Mar 2008 22:21:05 -0000

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

Change 138480 by rwatson@rwatson_cinnamon on 2008/03/24 22:20:58

	Merge $FreeBSD$ from CVS to zcopybpf branch.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.c#7 edit
.. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.h#3 edit
.. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#35 edit
.. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#13 edit

Differences ...

==== //depot/projects/zcopybpf/src/sys/net/bpf_buffer.c#7 (text+ko) ====

@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/bpf_buffer.c,v 1.1 2008/03/24 13:49:17 csjp Exp $");
 
 #include "opt_bpf.h"
 

==== //depot/projects/zcopybpf/src/sys/net/bpf_buffer.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_buffer.h,v 1.1 2008/03/24 13:49:17 csjp Exp $
  */
 
 #ifndef _NET_BPF_BUFFER_H_

==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#35 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+_FBSDID("$FreeBSD: src/sys/net/bpf_zerocopy.c,v 1.1 2008/03/24 13:49:17 csjp Exp $");
 
 #include "opt_bpf.h"
 

==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#13 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_zerocopy.h,v 1.1 2008/03/24 13:49:17 csjp Exp $
  */
 
 #ifndef _NET_BPF_ZEROCOPY_H_