release/8.2.0_cvs

51 files changed, 52 insertions, 52 deletions

diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 0e64860eb7a8..e413f4f275c8 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -2,7 +2,7 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.26.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 310c54d42877..cd4a88cef992 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -1,7 +1,7 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.42.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index f8a8365c448e..103a3d1f4443 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.273.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 3159f1c1a67b..c079cd1bcf1c 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -1,7 +1,7 @@
 # Makefile.ia64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.70.10.3.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips
index 6291d6cb464e..f639a753848c 100644
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -1,5 +1,5 @@
 # Makefile.mips
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.mips,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 18ee498bcf3a..921a1634b00e 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.175.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 81b1bb483359..96abdccad142 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.powerpc -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.285.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 947ec87ace50..d7e29bd97b1d 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -1,7 +1,7 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.40.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.sun4v b/sys/conf/Makefile.sun4v
index 947ec87ace50..bbe205677a9a 100644
--- a/sys/conf/Makefile.sun4v
+++ b/sys/conf/Makefile.sun4v
@@ -1,7 +1,7 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.3.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index aba769d61882..5eec9059bbfb 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/NOTES,v 1.1553.2.16.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
diff --git a/sys/conf/files b/sys/conf/files
index 76d954f0f011..056aca686b80 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files,v 1.1459.2.47.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 7f03d400b42b..97d689e07c90 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.amd64,v 1.139.2.18.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index be0f9959f50e..711e0afb00cf 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.arm,v 1.22.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 arm/arm/autoconf.c		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 5baf2fcc7083..93f4fc123e51 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.i386,v 1.625.2.16.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 253c55ed0564..f7e53be93655 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.ia64,v 1.99.2.7.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index 21ebe0d368ce..d768c1b09df1 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -14,7 +14,7 @@
 # Copyright (c) 2001, 2004-2005, Juniper Networks, Inc.
 # All rights reserved.
 # JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.mips,v 1.7.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # ----------------------------------------------------------------------
 # Phase 2
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index a5074f37f1b9..aa0c0cb0fb01 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801/PC-9821
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.pc98,v 1.376.2.12.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index bb6d713f1abd..a602b7f6ac8b 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.107.2.5.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index e393cd35f06d..93e52c4ab206 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.106.2.6.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.sun4v b/sys/conf/files.sun4v
index 5964f5659fc3..7b3cea9c977b 100644
--- a/sys/conf/files.sun4v
+++ b/sys/conf/files.sun4v
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.19.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index f9618ef10a63..b58484732860 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.mk,v 1.59.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index ed565686391c..80fee5f2b256 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.105.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index e82b25781d9b..958342022b45 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.107.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 56ef3eff2bf1..a8d43a696db9 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.227.2.3.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # The include file <bsd.kmod.mk> handles building and installing loadable
 # kernel modules.
diff --git a/sys/conf/kmod_syms.awk b/sys/conf/kmod_syms.awk
index 677d813507ee..8503d86854bd 100644
--- a/sys/conf/kmod_syms.awk
+++ b/sys/conf/kmod_syms.awk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod_syms.awk,v 1.4.36.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 
 # Read global symbols from object file.
 BEGIN {
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index 68ab1a2c7e4e..b0d524dc7e9d 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9.30.1.6.1 2010/12/21 17:09:25 kensmith Exp $ */
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm
index 3ccf916b1d77..95ed87fd64ab 100644
--- a/sys/conf/ldscript.arm
+++ b/sys/conf/ldscript.arm
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.arm,v 1.3.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $ */
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index a94f32fdd4c2..edf19f489b81 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.9.32.1.6.1 2010/12/21 17:09:25 kensmith Exp $ */
 OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
 OUTPUT_ARCH(i386)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.ia64 b/sys/conf/ldscript.ia64
index 8dc0368c7522..82dcfe70b420 100644
--- a/sys/conf/ldscript.ia64
+++ b/sys/conf/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.12.22.1.6.1 2010/12/21 17:09:25 kensmith Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(__start)
diff --git a/sys/conf/ldscript.mips b/sys/conf/ldscript.mips
index 0736fd1c4536..aa0eae148907 100644
--- a/sys/conf/ldscript.mips
+++ b/sys/conf/ldscript.mips
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/ldscript.mips,v 1.3.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", 
diff --git a/sys/conf/ldscript.mips.64 b/sys/conf/ldscript.mips.64
index cc533643b882..79c64447e2dc 100644
--- a/sys/conf/ldscript.mips.64
+++ b/sys/conf/ldscript.mips.64
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/ldscript.mips.64,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips")
diff --git a/sys/conf/ldscript.mips.64.cfe b/sys/conf/ldscript.mips.64.cfe
index 027456de1ca9..d137f7cc4964 100644
--- a/sys/conf/ldscript.mips.64.cfe
+++ b/sys/conf/ldscript.mips.64.cfe
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/ldscript.mips.64.cfe,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 /*
diff --git a/sys/conf/ldscript.mips.cfe b/sys/conf/ldscript.mips.cfe
index 0a50e9d46e86..48393ada0a45 100644
--- a/sys/conf/ldscript.mips.cfe
+++ b/sys/conf/ldscript.mips.cfe
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.3.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 /*
diff --git a/sys/conf/ldscript.mips.n32 b/sys/conf/ldscript.mips.n32
index 6cefe03d78a7..1c0f3391e532 100644
--- a/sys/conf/ldscript.mips.n32
+++ b/sys/conf/ldscript.mips.n32
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/ldscript.mips.n32,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
  */
 
 OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", 
diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc
index b7038bf256de..35de8b16b199 100644
--- a/sys/conf/ldscript.powerpc
+++ b/sys/conf/ldscript.powerpc
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.powerpc,v 1.8.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $ */
 
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
diff --git a/sys/conf/ldscript.sparc64 b/sys/conf/ldscript.sparc64
index 6f9c021ae1b3..1379abb7bf41 100644
--- a/sys/conf/ldscript.sparc64
+++ b/sys/conf/ldscript.sparc64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.32.1.6.1 2010/12/21 17:09:25 kensmith Exp $ */
 OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
 	      "elf64-sparc")
 OUTPUT_ARCH(sparc:v9)
diff --git a/sys/conf/makeLINT.mk b/sys/conf/makeLINT.mk
index e7ca90921931..5bf08d5c6037 100644
--- a/sys/conf/makeLINT.mk
+++ b/sys/conf/makeLINT.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/makeLINT.mk,v 1.1.34.2.4.1 2010/12/21 17:09:25 kensmith Exp $
 
 all:
 	@echo "make LINT only"
diff --git a/sys/conf/makeLINT.sed b/sys/conf/makeLINT.sed
index 83445cfcb705..d6f688a43d2d 100644
--- a/sys/conf/makeLINT.sed
+++ b/sys/conf/makeLINT.sed
@@ -1,5 +1,5 @@
 #!/usr/bin/sed -E -n -f
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/makeLINT.sed,v 1.3.34.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 
 /^(machine|ident|device|nodevice|makeoptions|nomakeoption|options|option|nooption|profile|cpu|maxusers)[[:space:]]/ {
     s/[[:space:]]*#.*$//
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d9301866dd19..09dce9c6f828 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.83.2.12.2.5 2011/02/16 15:24:22 kensmith Exp $
 
 TYPE="FreeBSD"
 REVISION="8.2"
@@ -36,7 +36,7 @@ BRANCH="RELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-RELEASE="${REVISION}-${BRANCH}"
+RELEASE=8.2-RELEASE
 VERSION="${TYPE} ${RELEASE}"
 
 if [ "X${PARAMFILE}" != "X" ]; then
diff --git a/sys/conf/options b/sys/conf/options
index 21f744cdf707..8238de982160 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options,v 1.687.2.10.2.1 2010/12/21 17:09:25 kensmith Exp $
 #
 #        On the handling of kernel options
 #
diff --git a/sys/conf/options-compat b/sys/conf/options-compat
index aa4325a25056..755b1147399b 100644
--- a/sys/conf/options-compat
+++ b/sys/conf/options-compat
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options-compat,v 1.1.2.1.2.1 2010/12/21 17:09:25 kensmith Exp $
 COMPAT_IA32	COMPAT_FREEBSD32
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index ad5301ddc792..9a5433cb29fb 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.amd64,v 1.35.2.7.2.1 2010/12/21 17:09:25 kensmith Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 83dbc5f5ae73..930ba2792738 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/conf/options.arm,v 1.24.2.3.2.1 2010/12/21 17:09:25 kensmith Exp $
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
 ARMFPE			opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 1ab6942951b3..b7bbea8fe94c 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.i386,v 1.244.2.5.2.1 2010/12/21 17:09:25 kensmith Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
index 4722c6217812..c1938f6cd964 100644
--- a/sys/conf/options.ia64
+++ b/sys/conf/options.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.ia64,v 1.29.2.4.4.1 2010/12/21 17:09:25 kensmith Exp $
 # Options specific to the ia64 platform kernels
 
 ITANIUM			opt_global.h
diff --git a/sys/conf/options.mips b/sys/conf/options.mips
index 02595315d1c2..529b81d1ac45 100644
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@@ -26,7 +26,7 @@
 # SUCH DAMAGE.
 #
 #	JNPR: options.mips,v 1.2 2006/09/15 12:52:34
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.mips,v 1.3.2.3.2.1 2010/12/21 17:09:25 kensmith Exp $
 
 CPU_MIPS4KC	opt_global.h
 CPU_MIPS32	opt_global.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 59d63f7a19f7..cb94cfbbf24c 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.pc98,v 1.205.2.4.2.1 2010/12/21 17:09:25 kensmith Exp $
 # Options specific to the pc98 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc
index 296dc32cd856..0992587bb283 100644
--- a/sys/conf/options.powerpc
+++ b/sys/conf/options.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.powerpc,v 1.12.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
 # Options specific to the powerpc platform kernels
 
 AIM			opt_global.h
diff --git a/sys/conf/options.sparc64 b/sys/conf/options.sparc64
index 814605f2fa30..05cb61ee0844 100644
--- a/sys/conf/options.sparc64
+++ b/sys/conf/options.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.18.2.3.2.1 2010/12/21 17:09:25 kensmith Exp $
 
 GFB_DEBUG		opt_gfb.h
 GFB_NO_FONT_LOADING	opt_gfb.h
diff --git a/sys/conf/options.sun4v b/sys/conf/options.sun4v
index 29ed863fe5e5..ba1b6b81214c 100644
--- a/sys/conf/options.sun4v
+++ b/sys/conf/options.sun4v
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.sun4v,v 1.2.10.2.2.1 2010/12/21 17:09:25 kensmith Exp $
 
 SUN4V			opt_global.h
 
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index d393be8a2793..580bc74f3620 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)systags.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/systags.sh,v 1.10.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
 #
 # systags.sh - construct a system tags file using dependence relations
 #	in a .depend file