release/5.4.0_cvs

71 files changed, 71 insertions, 71 deletions

diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index bb9cbf07f7df4..9e93ba429e4f4 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde.c,v 1.28 2004/08/08 07:57:51 phk Exp $
  *
  */
 
diff --git a/sys/geom/bde/g_bde.h b/sys/geom/bde/g_bde.h
index 9332c6b270615..efd3d9fce658f 100644
--- a/sys/geom/bde/g_bde.h
+++ b/sys/geom/bde/g_bde.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde.h,v 1.6 2003/10/07 09:28:07 phk Exp $
  */
 
 #ifndef _SYS_GEOM_BDE_G_BDE_H_
diff --git a/sys/geom/bde/g_bde_crypt.c b/sys/geom/bde/g_bde_crypt.c
index e9de5823fde3a..f39000d0c8178 100644
--- a/sys/geom/bde/g_bde_crypt.c
+++ b/sys/geom/bde/g_bde_crypt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.19.2.2 2005/01/31 23:26:01 imp Exp $
  */
 
 /*
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c
index 3a907b3c091f0..f3d7d31899a7d 100644
--- a/sys/geom/bde/g_bde_lock.c
+++ b/sys/geom/bde/g_bde_lock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.12.4.3 2005/01/31 23:26:01 imp Exp $
  */
 
 /*
diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c
index 125915b114676..8e3e291cc81e7 100644
--- a/sys/geom/bde/g_bde_work.c
+++ b/sys/geom/bde/g_bde_work.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_work.c,v 1.24.2.1 2005/01/31 23:26:01 imp Exp $
  */
 
 /*
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index f64ae0ac243f6..eb25c88179713 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.18.2.3.2.1 2005/04/06 13:08:24 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/concat/g_concat.h b/sys/geom/concat/g_concat.h
index d5c40de868e7d..f7f06c9226dd7 100644
--- a/sys/geom/concat/g_concat.h
+++ b/sys/geom/concat/g_concat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.10.2.1 2005/03/01 14:22:30 pjd Exp $
  */
 
 #ifndef	_G_CONCAT_H_
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index bc6ba15ad6814..85801b6f21345 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/gate/g_gate.c,v 1.11.2.2 2005/03/01 12:24:56 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/geom/gate/g_gate.h b/sys/geom/gate/g_gate.h
index 929826abd10cb..b29fb5c4deddd 100644
--- a/sys/geom/gate/g_gate.h
+++ b/sys/geom/gate/g_gate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/gate/g_gate.h,v 1.3 2004/05/03 21:02:02 pjd Exp $
  */
 
 #ifndef _G_GATE_H_
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index 0b8ba210fc8d3..33579314791e8 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom.h,v 1.84.2.5 2005/02/28 19:32:23 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_H_
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 9d17fa93e239e..78de2fbd52c8d 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_aes.c,v 1.26.2.1 2005/01/31 23:26:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c
index 04f5cac1af80e..c7a6d0774085d 100644
--- a/sys/geom/geom_apple.c
+++ b/sys/geom/geom_apple.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_apple.c,v 1.16 2004/08/08 07:57:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index e03547cb719e6..988c86c14257e 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd.c,v 1.70.2.3 2005/03/22 13:41:58 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_bsd_enc.c b/sys/geom/geom_bsd_enc.c
index a526cac487199..acba77f6dc356 100644
--- a/sys/geom/geom_bsd_enc.c
+++ b/sys/geom/geom_bsd_enc.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd_enc.c,v 1.5.4.1 2005/01/31 23:26:00 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index bfa125dc0d0b7..6fbf73e5f2d76 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_ccd.c,v 1.152.2.1 2005/01/31 23:26:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index f8b03ccd9eacc..56e9e1e40d9eb 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.32.2.2.2.1 2005/04/12 13:34:34 pjd Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_ctl.h b/sys/geom/geom_ctl.h
index fd68bdaa428a3..32221cddbf0e8 100644
--- a/sys/geom/geom_ctl.h
+++ b/sys/geom/geom_ctl.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_ctl.h,v 1.5 2003/06/01 13:47:51 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_CTL_H_
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 7ece0b18a8b67..d4de1f17349d7 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.79.2.3 2005/02/28 19:32:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index c4210c2537837..35e3b568ff621 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.91.2.3 2005/02/28 18:42:01 phk Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index a94df8916d8f4..fb2f1bff1a1bc 100644
--- a/sys/geom/geom_disk.h
+++ b/sys/geom/geom_disk.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_disk.h,v 1.3 2004/02/18 21:36:53 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_DISK_H_
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index fd7001f657871..283ba5f23974b 100644
--- a/sys/geom/geom_dump.c
+++ b/sys/geom/geom_dump.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_dump.c,v 1.31 2004/03/10 08:49:08 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/sbuf.h>
diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c
index dd2ff14d3c61f..b8730615d9072 100644
--- a/sys/geom/geom_event.c
+++ b/sys/geom/geom_event.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_event.c,v 1.50.2.1 2005/02/28 19:32:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/geom/geom_fox.c b/sys/geom/geom_fox.c
index 760d442fafc39..639f86a585fbf 100644
--- a/sys/geom/geom_fox.c
+++ b/sys/geom/geom_fox.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_fox.c,v 1.8.2.1 2005/01/31 23:26:00 imp Exp $
  */
 
 /*
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index 3f545906297d4..d4ce910cf8174 100644
--- a/sys/geom/geom_gpt.c
+++ b/sys/geom/geom_gpt.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_gpt.c,v 1.30 2004/08/08 07:57:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_int.h b/sys/geom/geom_int.h
index 39b3f1033ea93..9b99ed7527f01 100644
--- a/sys/geom/geom_int.h
+++ b/sys/geom/geom_int.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_int.h,v 1.28 2004/07/08 16:17:14 phk Exp $
  */
 
 LIST_HEAD(class_list_head, g_class);
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index 8bec01ce7cf78..eb8702b64b181 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.57.2.4 2005/01/30 03:02:10 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index 762a1fd69869f..48ae2958065c1 100644
--- a/sys/geom/geom_kern.c
+++ b/sys/geom/geom_kern.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.34.2.1 2004/09/28 18:16:51 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index 348d13fdf9aa7..7a0eae4590861 100644
--- a/sys/geom/geom_mbr.c
+++ b/sys/geom/geom_mbr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr.c,v 1.60.2.2 2005/02/28 13:59:03 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/geom/geom_mbr_enc.c b/sys/geom/geom_mbr_enc.c
index e3e3977582b41..f30ff55b0369c 100644
--- a/sys/geom/geom_mbr_enc.c
+++ b/sys/geom/geom_mbr_enc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr_enc.c,v 1.2.4.1 2005/01/31 23:26:00 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/diskmbr.h>
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index e26880a4d68bb..ac8f5bfc39724 100644
--- a/sys/geom/geom_pc98.c
+++ b/sys/geom/geom_pc98.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_pc98.c,v 1.47.2.1 2005/02/28 13:59:03 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_pc98_enc.c b/sys/geom/geom_pc98_enc.c
index 04de220436776..e691e19a05dbb 100644
--- a/sys/geom/geom_pc98_enc.c
+++ b/sys/geom/geom_pc98_enc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_pc98_enc.c,v 1.2 2003/06/11 06:49:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/diskpc98.h>
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index 45b552b3a5d31..448889b8c3fae 100644
--- a/sys/geom/geom_slice.c
+++ b/sys/geom/geom_slice.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.55.2.1 2004/08/19 06:56:50 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_slice.h b/sys/geom/geom_slice.h
index 4003c8fa0ad8d..6aa628f62a9ea 100644
--- a/sys/geom/geom_slice.h
+++ b/sys/geom/geom_slice.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_slice.h,v 1.17 2003/05/31 19:25:05 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_SLICE_H_
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index cdf963c20ad8d..ac8e498c75dfe 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.81.2.2 2005/02/28 19:32:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index ece8e1eba7716..0ed8f221c6062 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.43 2004/08/08 07:57:51 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_sunlabel_enc.c b/sys/geom/geom_sunlabel_enc.c
index eaca29255c388..d0fae68b7ef61 100644
--- a/sys/geom/geom_sunlabel_enc.c
+++ b/sys/geom/geom_sunlabel_enc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_sunlabel_enc.c,v 1.4.2.1 2005/01/31 23:26:00 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c
index 94175f74e2367..ee5f89c481f1c 100644
--- a/sys/geom/geom_vol_ffs.c
+++ b/sys/geom/geom_vol_ffs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_vol_ffs.c,v 1.13 2004/08/09 06:04:00 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index c8908c02c65ed..d172b126a14ff 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.7.2.4 2005/03/01 14:22:30 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index 2d17bbcdaa015..8f3e92c79d84c 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/label/g_label.h,v 1.3.2.1 2005/03/01 14:22:30 pjd Exp $
  */
 
 #ifndef	_G_LABEL_H_
diff --git a/sys/geom/label/g_label_iso9660.c b/sys/geom/label/g_label_iso9660.c
index 34d9252bdfdb9..8cdf07f37ded8 100644
--- a/sys/geom/label/g_label_iso9660.c
+++ b/sys/geom/label/g_label_iso9660.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_iso9660.c,v 1.1 2004/07/02 19:40:34 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_msdosfs.c b/sys/geom/label/g_label_msdosfs.c
index ff0d7c3b7e14f..50bc49c5016a9 100644
--- a/sys/geom/label/g_label_msdosfs.c
+++ b/sys/geom/label/g_label_msdosfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_msdosfs.c,v 1.1 2004/07/02 19:40:34 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c
index d15cbec0471a0..91809c7add549 100644
--- a/sys/geom/label/g_label_ufs.c
+++ b/sys/geom/label/g_label_ufs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.1.2.1 2005/03/01 13:58:47 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index 6747b9903690f..04dc3b8431b54 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.19.2.8 2005/03/01 14:22:31 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h
index 03827eadb732d..80cf2cb1771ea 100644
--- a/sys/geom/mirror/g_mirror.h
+++ b/sys/geom/mirror/g_mirror.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/mirror/g_mirror.h,v 1.8.2.5 2005/03/01 14:22:31 pjd Exp $
  */
 
 #ifndef	_G_MIRROR_H_
diff --git a/sys/geom/mirror/g_mirror_ctl.c b/sys/geom/mirror/g_mirror_ctl.c
index af0df61cfedea..d6ea66531927d 100644
--- a/sys/geom/mirror/g_mirror_ctl.c
+++ b/sys/geom/mirror/g_mirror_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror_ctl.c,v 1.4.2.2 2005/01/08 16:26:54 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 1a2cb3b058bab..c34bfd1d2ceaa 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.9.2.2 2004/09/19 10:38:57 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/nop/g_nop.h b/sys/geom/nop/g_nop.h
index 378c3eff490f9..3020d3bc430da 100644
--- a/sys/geom/nop/g_nop.h
+++ b/sys/geom/nop/g_nop.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/nop/g_nop.h,v 1.4 2004/07/30 08:19:22 pjd Exp $
  */
 
 #ifndef	_G_NOP_H_
diff --git a/sys/geom/notes b/sys/geom/notes
index 4fcacaefbc405..ced66dfcf1e36 100644
--- a/sys/geom/notes
+++ b/sys/geom/notes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/geom/notes,v 1.4.6.1 2004/09/13 06:26:57 phk Exp $
 
 For the lack of a better place to put them, this file will contain
 notes on some of the more intricate details of geom.
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index c1510a8023efc..aa38de7ea850e 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.4.2.7 2005/03/01 14:22:31 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h
index 0f4ac188a2eb5..b9ffae65745fa 100644
--- a/sys/geom/raid3/g_raid3.h
+++ b/sys/geom/raid3/g_raid3.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/raid3/g_raid3.h,v 1.1.2.5 2005/03/01 14:22:31 pjd Exp $
  */
 
 #ifndef	_G_RAID3_H_
diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c
index d07448136cfa1..f74a03174febe 100644
--- a/sys/geom/raid3/g_raid3_ctl.c
+++ b/sys/geom/raid3/g_raid3_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3_ctl.c,v 1.1.2.3 2005/01/08 16:29:05 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index acfa8fb7231d0..57ab5b2da0a0d 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/shsec/g_shsec.c,v 1.3.2.1 2005/03/01 13:17:30 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/shsec/g_shsec.h b/sys/geom/shsec/g_shsec.h
index af2e8a701d599..207578d4bbddd 100644
--- a/sys/geom/shsec/g_shsec.h
+++ b/sys/geom/shsec/g_shsec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/shsec/g_shsec.h,v 1.3.2.1 2005/03/01 13:17:30 pjd Exp $
  */
 
 #ifndef	_G_SHSEC_H_
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 4ebd7b61e32ce..e51e404524b8e 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/stripe/g_stripe.c,v 1.16.2.3 2005/03/01 14:22:31 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/stripe/g_stripe.h b/sys/geom/stripe/g_stripe.h
index b343e235e5899..13a1efb83cc6a 100644
--- a/sys/geom/stripe/g_stripe.h
+++ b/sys/geom/stripe/g_stripe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/stripe/g_stripe.h,v 1.5.2.1 2005/03/01 14:22:31 pjd Exp $
  */
 
 #ifndef	_G_STRIPE_H_
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 98321e813a4ca..af5f106f1ea58 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.1.2.3 2004/12/03 22:21:20 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 252b48f8879cf..3866e7e8426e4 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.9.2.5 2005/01/31 23:26:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum.h b/sys/geom/vinum/geom_vinum.h
index 15216dc095496..6858704fdcf24 100644
--- a/sys/geom/vinum/geom_vinum.h
+++ b/sys/geom/vinum/geom_vinum.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.2.2.4 2004/12/08 20:41:44 le Exp $
  */
 
 #ifndef	_GEOM_VINUM_H_
diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c
index 9de19eb730463..49f4303ce1f4a 100644
--- a/sys/geom/vinum/geom_vinum_drive.c
+++ b/sys/geom/vinum/geom_vinum_drive.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.9.2.3 2005/02/28 20:06:38 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_init.c b/sys/geom/vinum/geom_vinum_init.c
index 963b98bd77e48..8e4b402d01c4e 100644
--- a/sys/geom/vinum/geom_vinum_init.c
+++ b/sys/geom/vinum/geom_vinum_init.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_init.c,v 1.2.2.4 2005/02/10 12:49:39 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_list.c b/sys/geom/vinum/geom_vinum_list.c
index cb4ccfa5a45f3..3c3d99d101a90 100644
--- a/sys/geom/vinum/geom_vinum_list.c
+++ b/sys/geom/vinum/geom_vinum_list.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_list.c,v 1.1.2.2 2005/01/31 23:26:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c
index 9e77693d702f3..7eb88b540f85f 100644
--- a/sys/geom/vinum/geom_vinum_plex.c
+++ b/sys/geom/vinum/geom_vinum_plex.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.8.2.6 2005/02/10 12:51:29 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_raid5.c b/sys/geom/vinum/geom_vinum_raid5.c
index 789db193ecbd4..85758d9330d59 100644
--- a/sys/geom/vinum/geom_vinum_raid5.c
+++ b/sys/geom/vinum/geom_vinum_raid5.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.5.2.4 2004/12/08 20:36:35 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_raid5.h b/sys/geom/vinum/geom_vinum_raid5.h
index 747307d05d808..628820eb5ae43 100644
--- a/sys/geom/vinum/geom_vinum_raid5.h
+++ b/sys/geom/vinum/geom_vinum_raid5.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.h,v 1.2.2.4 2005/01/31 23:26:01 imp Exp $
  */
 
 #ifndef _GEOM_VINUM_RAID5_H_
diff --git a/sys/geom/vinum/geom_vinum_rm.c b/sys/geom/vinum/geom_vinum_rm.c
index f4c191a4727bb..f04ee3cf1b325 100644
--- a/sys/geom/vinum/geom_vinum_rm.c
+++ b/sys/geom/vinum/geom_vinum_rm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.1.2.2 2005/01/31 23:26:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c
index 1219f0e1bb7e8..b68ff64bf3105 100644
--- a/sys/geom/vinum/geom_vinum_share.c
+++ b/sys/geom/vinum/geom_vinum_share.c
@@ -41,7 +41,7 @@
 /* This file is shared between kernel and userland. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_share.c,v 1.2.2.2 2004/12/08 20:19:31 le Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/vinum/geom_vinum_share.h b/sys/geom/vinum/geom_vinum_share.h
index f15f45df667c6..c02a9ab11c4cb 100644
--- a/sys/geom/vinum/geom_vinum_share.h
+++ b/sys/geom/vinum/geom_vinum_share.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_share.h,v 1.1.2.1 2004/12/08 20:19:31 le Exp $
  */
 
 #ifndef _GEOM_VINUM_SHARE_H_
diff --git a/sys/geom/vinum/geom_vinum_state.c b/sys/geom/vinum/geom_vinum_state.c
index 81e305a346eea..ab18d7fa00de5 100644
--- a/sys/geom/vinum/geom_vinum_state.c
+++ b/sys/geom/vinum/geom_vinum_state.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.2.2.3 2005/02/10 12:52:32 le Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index ff91196e78238..3d2e7262fd29d 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.6.2.4 2005/02/10 12:45:51 le Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index afc03087f6877..66386c54520e8 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *  
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_var.h,v 1.1.2.6 2005/02/28 20:09:39 le Exp $
  */
 
 #ifndef	_GEOM_VINUM_VAR_H_
diff --git a/sys/geom/vinum/geom_vinum_volume.c b/sys/geom/vinum/geom_vinum_volume.c
index 1e89cf8bd7dee..34dbb0767482e 100644
--- a/sys/geom/vinum/geom_vinum_volume.c
+++ b/sys/geom/vinum/geom_vinum_volume.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_volume.c,v 1.4.2.3 2005/02/28 20:09:39 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>