Copy releng/8.2 to release/8.2.0 for 8.2-RELEASE.release/8.2.0_cvs

Approved by:	re (implicit)

This commit was manufactured to restore the state of the 8.2-RELEASE image.

27 files changed, 28 insertions, 28 deletions

diff --git a/sys/netinet/ipfw/dn_heap.c b/sys/netinet/ipfw/dn_heap.c
index 6773851327c3..0446a8e84185 100644
--- a/sys/netinet/ipfw/dn_heap.c
+++ b/sys/netinet/ipfw/dn_heap.c
@@ -27,13 +27,13 @@
 /*
  * Binary heap and hash tables, used in dummynet
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_heap.c,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #ifdef _KERNEL
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/dn_heap.c,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ipfw/dn_heap.h b/sys/netinet/ipfw/dn_heap.h
index c95473ade392..a6be1d659c3e 100644
--- a/sys/netinet/ipfw/dn_heap.h
+++ b/sys/netinet/ipfw/dn_heap.h
@@ -27,7 +27,7 @@
 /*
  * Binary heap and hash tables, header file
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_heap.h,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifndef _IP_DN_HEAP_H
diff --git a/sys/netinet/ipfw/dn_sched.h b/sys/netinet/ipfw/dn_sched.h
index fe54b0205cf3..3f5d96de0e4b 100644
--- a/sys/netinet/ipfw/dn_sched.h
+++ b/sys/netinet/ipfw/dn_sched.h
@@ -27,7 +27,7 @@
 /*
  * The API to write a packet scheduling algorithm for dummynet.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_sched.h,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifndef _DN_SCHED_H
diff --git a/sys/netinet/ipfw/dn_sched_fifo.c b/sys/netinet/ipfw/dn_sched_fifo.c
index 0bb3800a9c2a..1139f3d69cb1 100644
--- a/sys/netinet/ipfw/dn_sched_fifo.c
+++ b/sys/netinet/ipfw/dn_sched_fifo.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_sched_fifo.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/netinet/ipfw/dn_sched_prio.c b/sys/netinet/ipfw/dn_sched_prio.c
index 28f60062cfc5..bf3766eeafc0 100644
--- a/sys/netinet/ipfw/dn_sched_prio.c
+++ b/sys/netinet/ipfw/dn_sched_prio.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_sched_prio.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 #ifdef _KERNEL
 #include <sys/malloc.h>
diff --git a/sys/netinet/ipfw/dn_sched_qfq.c b/sys/netinet/ipfw/dn_sched_qfq.c
index 44555ee09e28..378ccaae77e9 100644
--- a/sys/netinet/ipfw/dn_sched_qfq.c
+++ b/sys/netinet/ipfw/dn_sched_qfq.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_sched_qfq.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/netinet/ipfw/dn_sched_rr.c b/sys/netinet/ipfw/dn_sched_rr.c
index fc7be001b305..589482ca0aea 100644
--- a/sys/netinet/ipfw/dn_sched_rr.c
+++ b/sys/netinet/ipfw/dn_sched_rr.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_sched_rr.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/netinet/ipfw/dn_sched_wf2q.c b/sys/netinet/ipfw/dn_sched_wf2q.c
index 1fbc1202e405..135d25a525e4 100644
--- a/sys/netinet/ipfw/dn_sched_wf2q.c
+++ b/sys/netinet/ipfw/dn_sched_wf2q.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/dn_sched_wf2q.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/netinet/ipfw/dummynet.txt b/sys/netinet/ipfw/dummynet.txt
index 0ed6ad15d327..422b86f5a0c7 100644
--- a/sys/netinet/ipfw/dummynet.txt
+++ b/sys/netinet/ipfw/dummynet.txt
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/netinet/ipfw/dummynet.txt,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 
 Notes on the internal structure of dummynet (2010 version)
diff --git a/sys/netinet/ipfw/ip_dn_glue.c b/sys/netinet/ipfw/ip_dn_glue.c
index c0df1fc04be0..3d95f58761d5 100644
--- a/sys/netinet/ipfw/ip_dn_glue.c
+++ b/sys/netinet/ipfw/ip_dn_glue.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/ip_dn_glue.c,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  *
  * Binary compatibility support for /sbin/ipfw RELENG_7 and RELENG_8
  */
diff --git a/sys/netinet/ipfw/ip_dn_io.c b/sys/netinet/ipfw/ip_dn_io.c
index 2e9867ebd959..6d803d40c1d0 100644
--- a/sys/netinet/ipfw/ip_dn_io.c
+++ b/sys/netinet/ipfw/ip_dn_io.c
@@ -28,7 +28,7 @@
  * Dummynet portions related to packet handling.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dn_io.c,v 1.2.2.4.4.2 2010/12/28 12:18:46 oleg Exp $");
 
 #include "opt_inet6.h"
 
diff --git a/sys/netinet/ipfw/ip_dn_private.h b/sys/netinet/ipfw/ip_dn_private.h
index 270f18813268..ddae20ba41a0 100644
--- a/sys/netinet/ipfw/ip_dn_private.h
+++ b/sys/netinet/ipfw/ip_dn_private.h
@@ -27,7 +27,7 @@
 /*
  * internal dummynet APIs.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/ip_dn_private.h,v 1.3.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifndef _IP_DN_PRIVATE_H
diff --git a/sys/netinet/ipfw/ip_dummynet.c b/sys/netinet/ipfw/ip_dummynet.c
index d7073eb797ee..c646a1d01677 100644
--- a/sys/netinet/ipfw/ip_dummynet.c
+++ b/sys/netinet/ipfw/ip_dummynet.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.5.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $");
 
 /*
  * Configuration and internal object management for dummynet.
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c
index d82c2a7253b1..4f0efb96848d 100644
--- a/sys/netinet/ipfw/ip_fw2.c
+++ b/sys/netinet/ipfw/ip_fw2.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw2.c,v 1.11.2.10.2.1 2010/12/21 17:09:25 kensmith Exp $");
 
 /*
  * The FreeBSD IP packet firewall, main file
diff --git a/sys/netinet/ipfw/ip_fw_dynamic.c b/sys/netinet/ipfw/ip_fw_dynamic.c
index 69475828e1e7..a35f4011d302 100644
--- a/sys/netinet/ipfw/ip_fw_dynamic.c
+++ b/sys/netinet/ipfw/ip_fw_dynamic.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw_dynamic.c,v 1.8.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
 
 #define        DEB(x)
 #define        DDB(x) x
diff --git a/sys/netinet/ipfw/ip_fw_log.c b/sys/netinet/ipfw/ip_fw_log.c
index 3560e137f1e5..6f6c535decd1 100644
--- a/sys/netinet/ipfw/ip_fw_log.c
+++ b/sys/netinet/ipfw/ip_fw_log.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw_log.c,v 1.9.2.4.2.1 2010/12/21 17:09:25 kensmith Exp $");
 
 /*
  * Logging support for ipfw
diff --git a/sys/netinet/ipfw/ip_fw_nat.c b/sys/netinet/ipfw/ip_fw_nat.c
index 6f223ed0de6f..acc9c6087eab 100644
--- a/sys/netinet/ipfw/ip_fw_nat.c
+++ b/sys/netinet/ipfw/ip_fw_nat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw_nat.c,v 1.5.2.3.2.1 2010/12/21 17:09:25 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c
index 1967b0d702b0..1a9ef9b4fb6d 100644
--- a/sys/netinet/ipfw/ip_fw_pfil.c
+++ b/sys/netinet/ipfw/ip_fw_pfil.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw_pfil.c,v 1.4.2.5.2.1 2010/12/21 17:09:25 kensmith Exp $");
 
 #if !defined(KLD_MODULE)
 #include "opt_ipfw.h"
diff --git a/sys/netinet/ipfw/ip_fw_private.h b/sys/netinet/ipfw/ip_fw_private.h
index c29ae0ad90b7..f96021db43aa 100644
--- a/sys/netinet/ipfw/ip_fw_private.h
+++ b/sys/netinet/ipfw/ip_fw_private.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/ip_fw_private.h,v 1.13.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #ifndef _IPFW2_PRIVATE_H
diff --git a/sys/netinet/ipfw/ip_fw_sockopt.c b/sys/netinet/ipfw/ip_fw_sockopt.c
index de7bfbe560f4..fb00c462a0e9 100644
--- a/sys/netinet/ipfw/ip_fw_sockopt.c
+++ b/sys/netinet/ipfw/ip_fw_sockopt.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw_sockopt.c,v 1.14.2.5.4.1 2010/12/21 17:09:25 kensmith Exp $");
 
 /*
  * Sockopt support for ipfw. The routines here implement
diff --git a/sys/netinet/ipfw/ip_fw_table.c b/sys/netinet/ipfw/ip_fw_table.c
index 517622f02171..7bebaec1775c 100644
--- a/sys/netinet/ipfw/ip_fw_table.c
+++ b/sys/netinet/ipfw/ip_fw_table.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_fw_table.c,v 1.9.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
 
 /*
  * Lookup table support for ipfw
diff --git a/sys/netinet/ipfw/test/Makefile b/sys/netinet/ipfw/test/Makefile
index c556a4bf3d51..5baf1f77e037 100644
--- a/sys/netinet/ipfw/test/Makefile
+++ b/sys/netinet/ipfw/test/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/netinet/ipfw/test/Makefile,v 1.2.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for building userland tests
 # this is written in a form compatible with gmake
diff --git a/sys/netinet/ipfw/test/dn_test.h b/sys/netinet/ipfw/test/dn_test.h
index 4e079bc4d68b..cdaab97cdadb 100644
--- a/sys/netinet/ipfw/test/dn_test.h
+++ b/sys/netinet/ipfw/test/dn_test.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/test/dn_test.h,v 1.3.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  *
  * userspace compatibility code for dummynet schedulers
  */
diff --git a/sys/netinet/ipfw/test/main.c b/sys/netinet/ipfw/test/main.c
index be9fdf53612c..01ff09138a16 100644
--- a/sys/netinet/ipfw/test/main.c
+++ b/sys/netinet/ipfw/test/main.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/test/main.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  *
  * Testing program for schedulers
  *
diff --git a/sys/netinet/ipfw/test/mylist.h b/sys/netinet/ipfw/test/mylist.h
index 6247f32ea4e4..1c1fb9a6c8ed 100644
--- a/sys/netinet/ipfw/test/mylist.h
+++ b/sys/netinet/ipfw/test/mylist.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/test/mylist.h,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  *
  * linux-like bidirectional lists
  */
diff --git a/sys/netinet/ipfw/test/test_dn_heap.c b/sys/netinet/ipfw/test/test_dn_heap.c
index d460cf2ff36b..ec133cef047c 100644
--- a/sys/netinet/ipfw/test/test_dn_heap.c
+++ b/sys/netinet/ipfw/test/test_dn_heap.c
@@ -27,7 +27,7 @@
 /*
  * Userland code for testing binary heaps and hash tables
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/test/test_dn_heap.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/netinet/ipfw/test/test_dn_sched.c b/sys/netinet/ipfw/test/test_dn_sched.c
index ee46c95ed868..87aa45180106 100644
--- a/sys/netinet/ipfw/test/test_dn_sched.c
+++ b/sys/netinet/ipfw/test/test_dn_sched.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipfw/test/test_dn_sched.c,v 1.2.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
  *
  * library functions for userland testing of dummynet schedulers
  */