PERFORCE change 138480 for review

[Robert Watson]

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

Change 138480 by rwatson at 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_