This commit was manufactured by cvs2svn to create tagrelease/4.1.0_cvs

'RELENG_4_1_0_RELEASE'.

This commit was manufactured to restore the state of the 4.1-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

453 files changed, 487 insertions, 487 deletions

diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index e769ca42fe70..33d0b9dfda60 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.9.2.1 2000/04/14 13:32:44 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index bb77475e91c1..e9b34969ce09 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -44,7 +44,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.14.2.2 2000/07/14 10:28:44 asmodai Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 85031c825b0c..4070980c5ec3 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -57,7 +57,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.11.2.1 2000/04/14 13:32:47 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 15b33d40369b..43f7b83cdecd 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.14.2.2 2000/05/23 10:13:25 nyan Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index ab4e550a9afe..5305f4379084 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advansys.h,v 1.2.2.1 2000/04/14 13:32:48 nyan Exp $
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index dd0f4ccd92b2..cf2daab65170 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advlib.c,v 1.15.2.1 2000/04/14 13:32:49 nyan Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index ba9703db1b6d..50ad3dc8086a 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.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/dev/advansys/advlib.h,v 1.8.2.1 2000/04/14 13:32:50 nyan Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index d53a4c6fe0e5..983abf4160e9 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -1,7 +1,7 @@
 /*
  * Downloadable microcode for Advanced Systems Inc. SCSI controllers
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advmcode.c,v 1.7 2000/01/14 03:33:38 gibbs Exp $
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index b9430b75fdc0..c075b22f5485 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advmcode.h,v 1.6 2000/01/14 03:33:38 gibbs Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 3089a1559280..ae58b53f4e03 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.12 2000/03/02 00:08:34 gibbs Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index a3427fc7ffbc..6f122feabe17 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.7 2000/03/02 00:08:34 gibbs Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index 9abf933f98b3..3ed642468b01 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.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/dev/advansys/adwlib.c,v 1.6.2.1 2000/04/14 13:32:50 nyan Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index c470c101b0bd..fb768773bff3 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.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/dev/advansys/adwlib.h,v 1.4 2000/03/02 00:08:35 gibbs Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index c5f0504a1908..c24070eaa0f3 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -2,7 +2,7 @@
  * Downloadable microcode for Second Generation
  * Advanced Systems Inc. SCSI controllers
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwmcode.c,v 1.3 2000/02/03 16:34:57 gibbs Exp $
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index 221845489867..8ced8403dc91 100644
--- a/sys/dev/advansys/adwmcode.h
+++ b/sys/dev/advansys/adwmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwmcode.h,v 1.3 2000/02/03 16:34:57 gibbs Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index bc2e4839f65c..823f7dbd1383 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwvar.h,v 1.3 2000/02/03 16:34:57 gibbs Exp $
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index a701dfe9498f..6308706aa200 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/aha.c,v 1.34 2000/01/24 07:08:39 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 53ef9a958a7a..924dd3ae9e04 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.17 2000/01/24 07:08:39 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c
index 8840db3b622c..692153195194 100644
--- a/sys/dev/aha/aha_mca.c
+++ b/sys/dev/aha/aha_mca.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/dev/aha/aha_mca.c,v 1.2 2000/01/24 07:08:40 imp Exp $
  *
  * Based on aha_isa.c
  */
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index 281d6a3721de..d5b2870756a3 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.8 2000/01/24 07:08:40 imp Exp $
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 3ee5149cefdb..188c49a4a05d 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.18 2000/01/29 18:22:33 peter Exp $
  */
 
 #include <stddef.h>	/* For offsetof() */
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index c72f068aa3b9..672012f60ba1 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ahb/ahbreg.h,v 1.2 1999/08/28 00:43:37 peter Exp $
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 07687bfc3b6c..7dfc81b5e1a8 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.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/dev/aic/aic.c,v 1.8 2000/01/14 23:42:35 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index 7dafac46d420..d00cb6dd8ffc 100644
--- a/sys/dev/aic/aic6360reg.h
+++ b/sys/dev/aic/aic6360reg.h
@@ -29,7 +29,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aic6360reg.h,v 1.1 1999/10/21 08:56:52 luoqi Exp $
  */
 
 #define SCSISEQ		0x00	/* SCSI sequence control */
diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c
index 847aadc74f10..14122bf9d330 100644
--- a/sys/dev/aic/aic_cbus.c
+++ b/sys/dev/aic/aic_cbus.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/dev/aic/aic_cbus.c,v 1.1.2.2 2000/06/21 09:37:09 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index c7eb09345d2c..902b41da1485 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.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/dev/aic/aic_isa.c,v 1.3 2000/01/14 23:42:35 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 5beeedca0931..7248b2d16c6e 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.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/dev/aic/aic_pccard.c,v 1.1 2000/01/14 23:42:36 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index 5d789b493b95..81305b180f4a 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.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/dev/aic/aicvar.h,v 1.2 1999/12/04 22:15:02 luoqi Exp $
  */
 
 #include "aic.h"
diff --git a/sys/dev/aic7xxx/93cx6.c b/sys/dev/aic7xxx/93cx6.c
index 06e547b57b13..c90550a5f901 100644
--- a/sys/dev/aic7xxx/93cx6.c
+++ b/sys/dev/aic7xxx/93cx6.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/93cx6.c,v 1.5 2000/01/07 23:08:17 gibbs Exp $
  */
 
 /*
diff --git a/sys/dev/aic7xxx/93cx6.h b/sys/dev/aic7xxx/93cx6.h
index 7875032e28de..11a382b2c983 100644
--- a/sys/dev/aic7xxx/93cx6.h
+++ b/sys/dev/aic7xxx/93cx6.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/93cx6.h,v 1.4 2000/02/03 16:54:11 gibbs Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/Makefile b/sys/dev/aic7xxx/Makefile
index aa478151de4e..f0176c203574 100644
--- a/sys/dev/aic7xxx/Makefile
+++ b/sys/dev/aic7xxx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/aic7xxx/Makefile,v 1.6 1999/08/28 00:41:22 peter Exp $
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index 4e91eed4974b..adb26e633f81 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.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/dev/aic7xxx/ahc_eisa.c,v 1.15 2000/01/29 14:22:19 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 67bb43ab916f..13b04882ddf6 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.29.2.1 2000/03/18 22:57:48 gibbs Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 29e96f499136..c8b6ffb1cc6f 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.41.2.1 2000/03/18 23:00:11 gibbs Exp $
  */
 /*
  * A few notes on features of the driver.
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 534f2e4381d3..cbc37793171f 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.16 2000/02/09 21:24:59 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 78c95a85a117..fbb226469f24 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.20.2.1 2000/03/18 23:00:13 gibbs Exp $
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 187b22eae925..e4295915cd3c 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.94.2.1 2000/03/18 23:00:13 gibbs Exp $
  */
 
 #include <dev/aic7xxx/aic7xxx.reg>
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index 9af5c8343274..b3f78c79c8fd 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm.c,v 1.23 1999/08/28 00:41:25 peter Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h
index 7e6b4683dfdb..01dceb6ddbb4 100644
--- a/sys/dev/aic7xxx/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm.h,v 1.6 1999/12/06 18:23:30 gibbs Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm_gram.y b/sys/dev/aic7xxx/aicasm_gram.y
index 4d090598e4fa..38b0dbcb53ec 100644
--- a/sys/dev/aic7xxx/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm_gram.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_gram.y,v 1.8 1999/12/06 18:23:30 gibbs Exp $
  */
 
 #include <stdio.h>
diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l
index 28689cbd4996..20cae61b0962 100644
--- a/sys/dev/aic7xxx/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm_scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_scan.l,v 1.8 1999/12/06 18:23:30 gibbs Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm_symbol.c
index 8c250d2317ec..be17517a3015 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm_symbol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_symbol.c,v 1.8 1999/12/06 18:23:30 gibbs Exp $
  */
 
 
diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h
index 79809db8e6a5..7205abbfbf55 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm_symbol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_symbol.h,v 1.6 1999/12/06 18:23:31 gibbs Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h
index 4f054916ebe8..a17f2726cf1b 100644
--- a/sys/dev/aic7xxx/sequencer.h
+++ b/sys/dev/aic7xxx/sequencer.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/dev/aic7xxx/sequencer.h,v 1.6 1999/12/06 18:23:31 gibbs Exp $
  */
 
 struct ins_format1 {
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index fba983a8f4e3..d636aea5ccc6 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.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/dev/amr/amr.c,v 1.7.2.3 2000/06/10 19:23:28 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 6ce523dd0624..66b98fd03413 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.5.2.1 2000/04/11 00:12:46 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 382a4a8d3145..f53fc973033b 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.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/dev/amr/amr_pci.c,v 1.1.2.1 2000/04/11 00:12:46 msmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index 48e6efda467d..f91b8302cdc2 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.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/dev/amr/amrio.h,v 1.2 1999/11/02 03:24:09 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index 3ae84b915c22..d511965a77e9 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.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/dev/amr/amrreg.h,v 1.1 1999/10/07 02:23:12 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 84777b5c27aa..54f80d56f03b 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.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/dev/amr/amrvar.h,v 1.2.2.1 2000/04/11 00:12:46 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index aa869783dc74..00d9e0ccb331 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_aironet_ieee.h,v 1.1 2000/01/14 20:40:55 wpaul Exp $
  */
 
 #ifndef _IF_AIRONET_IEEE_H
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 3622632b061a..29ff3ad6998c 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.3 2000/07/17 21:24:24 archie Exp $
  */
 
 /*
@@ -133,7 +133,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.3 2000/07/17 21:24:24 archie Exp $";
 #endif
 
 /* These are global because we need them in sys/pci/if_an_p.c. */
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 1e887c07073a..9a24104863db 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.1 2000/07/17 21:24:25 archie Exp $
  */
 
 /*
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index dbaf9f49f7c6..cec632f3adf0 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.1 2000/07/17 21:24:25 archie Exp $
  */
 
 /*
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index f95dd01ecced..458fbff017a2 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.1 2000/07/17 21:24:25 archie Exp $
  */
 
 /*
@@ -82,7 +82,7 @@
 
 #ifndef lint
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.1 2000/07/17 21:24:25 archie Exp $";
 #endif
 
 #include <dev/an/if_aironet_ieee.h>
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index 36c1c45f1509..a2484be61f6c 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.1 2000/01/14 20:40:56 wpaul Exp $
  */
 
 #define AN_TIMEOUT	65536
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 69338d00ceef..e7513c9edf82 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/ata-all.c,v 1.50.2.4 2000/06/11 17:02:46 sos Exp $
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 14a3d971882e..893a6c966708 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/ata-all.h,v 1.26.2.1 2000/06/11 17:02:46 sos Exp $
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 863d0fd81f6f..069e97295a29 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/ata-disk.c,v 1.60.2.3 2000/06/11 17:02:46 sos Exp $
  */
 
 #include "apm.h"
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index 91e9fad92177..f97fcb3844c2 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/ata-disk.h,v 1.22.2.1 2000/03/14 20:25:08 sos Exp $
  */
 
 /* structure describing an ATA disk */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 543a379518c0..92797e895a48 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/ata-dma.c,v 1.35.2.2 2000/06/11 17:02:46 sos Exp $
  */
 
 #include "pci.h"
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index 5700a9a4700d..e2f647a82b5b 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-all.c,v 1.46.2.3 2000/04/01 14:11:38 sos Exp $
  */
 
 #include "atapicd.h"
diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h
index 6223f5d8e2cc..0a8ffc779b34 100644
--- a/sys/dev/ata/atapi-all.h
+++ b/sys/dev/ata/atapi-all.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-all.h,v 1.22.2.3 2000/04/01 14:11:39 sos Exp $
  */
 
 /* ATAPI misc defines */
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index e21a428f255b..13ba344b222a 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-cd.c,v 1.48.2.3 2000/05/03 08:57:31 sos Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index f99ac3ecbbdd..7bfd592d2b70 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-cd.h,v 1.15.2.2 2000/06/11 17:02:46 sos Exp $
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index c30385416277..5a9a363267b9 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-fd.c,v 1.44.2.2 2000/04/01 14:11:42 sos Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h
index b1416256bad6..7904d19ec52e 100644
--- a/sys/dev/ata/atapi-fd.h
+++ b/sys/dev/ata/atapi-fd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-fd.h,v 1.10 2000/02/18 20:57:30 sos Exp $
  */
 
 /* MODE SENSE parameter header */ 
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index d7d3cf4cef3d..c4f0898ed25d 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-tape.c,v 1.36.2.3 2000/04/01 14:11:43 sos Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h
index bccd66542e05..400c0fe848db 100644
--- a/sys/dev/ata/atapi-tape.h
+++ b/sys/dev/ata/atapi-tape.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ata/atapi-tape.h,v 1.11 2000/02/18 20:57:31 sos Exp $
  */
 
 /* ATAPI tape drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index a210f8323a2e..2d869815ff0d 100755
--- a/sys/dev/bktr/CHANGELOG.TXT
+++ b/sys/dev/bktr/CHANGELOG.TXT
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/CHANGELOG.TXT,v 1.8.2.1 2000/04/18 12:50:29 roger Exp $ */
 /*
  * MAINTAINER = Roger Hardiman <roger@freebsd.org>
  */
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index b38cbb79d455..97c80a46ae32 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.2.2.1 2000/04/18 12:50:29 roger Exp $ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index 0b363d5c25b0..15107f155fd9 100644
--- a/sys/dev/bktr/bktr_audio.h
+++ b/sys/dev/bktr/bktr_audio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.2 1999/10/28 13:58:14 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index 7b80be0c2059..3f370512cc06 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.9.2.1 2000/04/18 12:50:29 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_card.h b/sys/dev/bktr/bktr_card.h
index abebb458def1..0901b976977e 100644
--- a/sys/dev/bktr/bktr_card.h
+++ b/sys/dev/bktr/bktr_card.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.2.4.1 2000/04/18 12:50:30 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index d338d09b588a..289bb9f4a458 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.103.2.1 2000/04/18 12:50:30 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index 790d718e0c8d..5438ae32706f 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.2.2.1 2000/04/18 12:50:32 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 2021f9ed9338..63dd13816d29 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.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/dev/bktr/bktr_i2c.c,v 1.13.2.1 2000/04/18 12:50:32 roger Exp $
  *
  */
 
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index f687e4c00425..0d92cdf7e1eb 100644
--- a/sys/dev/bktr/bktr_i2c.h
+++ b/sys/dev/bktr/bktr_i2c.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/dev/bktr/bktr_i2c.h,v 1.2.4.1 2000/04/18 12:50:32 roger Exp $
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 25e722776910..cb301df3d219 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.4.2.1 2000/04/18 12:50:32 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index 2e1ff269c409..7dbf1269be2d 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.1.4.1 2000/04/18 12:50:33 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index 31fd35611f34..09af243eaeaa 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.36.2.1 2000/04/18 12:50:33 roger Exp $
  *
  * Copyright (c) 1999 Roger Hardiman
  * Copyright (c) 1998 Amancio Hasty
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index c63798cd35fe..9ab6bd52e686 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.5.2.1 2000/04/18 12:50:33 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_tuner.h b/sys/dev/bktr/bktr_tuner.h
index d7a67c0f834f..2de70373943f 100644
--- a/sys/dev/bktr/bktr_tuner.h
+++ b/sys/dev/bktr/bktr_tuner.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.h,v 1.1 1999/09/26 22:06:20 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 144c2c4362f9..6f23ca497124 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.25 1999/10/09 06:25:17 mdodd Exp $
  */
 
  /*
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index 8504ab124b3c..fec811fdeaac 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.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/dev/buslogic/bt_eisa.c,v 1.12 2000/01/29 14:27:26 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 9377be9f5781..55a9754ba322 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.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/dev/buslogic/bt_isa.c,v 1.18 1999/10/12 21:35:43 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c
index 08ac9ed649c7..e90435652562 100644
--- a/sys/dev/buslogic/bt_mca.c
+++ b/sys/dev/buslogic/bt_mca.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/dev/buslogic/bt_mca.c,v 1.4 1999/10/09 04:02:02 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 6c5d159e58bc..376e301633fd 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.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/dev/buslogic/bt_pci.c,v 1.11 2000/01/17 12:38:00 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index f6a1851757bf..723b1cdcddad 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.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/dev/buslogic/btreg.h,v 1.10 1999/10/09 06:25:17 mdodd Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/cardbus/Makefile.cardbusdevs b/sys/dev/cardbus/Makefile.cardbusdevs
index 1181493548ef..923e37cf9916 100644
--- a/sys/dev/cardbus/Makefile.cardbusdevs
+++ b/sys/dev/cardbus/Makefile.cardbusdevs
@@ -1,5 +1,5 @@
 #	$Id: Makefile.cardbusdevs,v 1.1.2.1 1999/02/16 16:46:06 haya Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/cardbus/Makefile.cardbusdevs,v 1.1 1999/11/18 07:21:50 imp Exp $
 
 AWK=	awk
 
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 394f1c965a04..33e275c97198 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /* FreeBSD/newconfig version. UCHIYAMA Yasushi 1999 */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.1 1999/11/18 07:21:50 imp Exp $ */
 #define CARDBUS_DEBUG
 
 #include <sys/types.h>
diff --git a/sys/dev/cardbus/cardbusdevs b/sys/dev/cardbus/cardbusdevs
index 5df9b6230458..f74d20e001fd 100644
--- a/sys/dev/cardbus/cardbusdevs
+++ b/sys/dev/cardbus/cardbusdevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/cardbus/cardbusdevs,v 1.1 1999/11/18 07:21:50 imp Exp $
 
 /*
  * Copyright (C) 1999  Hayakawa Koichi.
diff --git a/sys/dev/cardbus/cardbusdevs.h b/sys/dev/cardbus/cardbusdevs.h
index 4ffb3c8e0ca0..b1ba377c389b 100644
--- a/sys/dev/cardbus/cardbusdevs.h
+++ b/sys/dev/cardbus/cardbusdevs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/cardbus/cardbusdevs.h,v 1.1 1999/11/18 07:22:59 imp Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/cardbus/cardbusdevs_data.h b/sys/dev/cardbus/cardbusdevs_data.h
index 5a40a1f052d8..2f797043fb5e 100644
--- a/sys/dev/cardbus/cardbusdevs_data.h
+++ b/sys/dev/cardbus/cardbusdevs_data.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/cardbus/cardbusdevs_data.h,v 1.1 1999/11/18 07:22:59 imp Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index 56e2e56ec67d..960a51acab25 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.1 1999/11/18 07:21:50 imp Exp $ */
 
 typedef u_int32_t cardbusreg_t;
 typedef int cardbus_intr_line_t;
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 2f911411c477..ba47aa412a70 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cardbus/cardbusvar.h,v 1.1 1999/11/18 07:21:51 imp Exp $ */
 
 #if !defined SYS_DEV_PCCARD_CARDBUSVAR_H
 #define SYS_DEV_PCCARD_CARDBUSVAR_H
diff --git a/sys/dev/cardbus/devlist2h.awk b/sys/dev/cardbus/devlist2h.awk
index 2dd9caa694b8..a031d2b75283 100644
--- a/sys/dev/cardbus/devlist2h.awk
+++ b/sys/dev/cardbus/devlist2h.awk
@@ -1,6 +1,6 @@
 #! /usr/bin/awk -f
 #	$NetBSD: devlist2h.awk,v 1.5 1998/01/09 06:54:25 thorpej Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/sys/dev/cardbus/devlist2h.awk,v 1.1 1999/11/18 07:21:51 imp Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
 # All rights reserved.
diff --git a/sys/dev/cardbus/pccardcis.h b/sys/dev/cardbus/pccardcis.h
index ec3bfb87e748..62faf677ac94 100644
--- a/sys/dev/cardbus/pccardcis.h
+++ b/sys/dev/cardbus/pccardcis.h
@@ -1,5 +1,5 @@
 /*	$Id: pccardcis.h,v 1.1.2.1 1999/02/16 16:44:36 haya Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cardbus/pccardcis.h,v 1.1 1999/11/18 07:21:51 imp Exp $ */
 
 /*
  * Copyright (c) 1997 and 1998
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 672ffe2fbef1..6e1ac2e83979 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.73 2000/01/29 14:29:56 peter Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index 4efc484e7bcf..92010a235403 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/dec/mcclock.c,v 1.5 2000/01/04 03:22:04 mjacob Exp $ */
 /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */
 
 /*
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index 01b8a64dc6a2..cb3b97d09167 100644
--- a/sys/dev/dec/mcclock_if.m
+++ b/sys/dev/dec/mcclock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/dec/mcclock_if.m,v 1.3 1999/08/28 00:41:37 peter Exp $
 #
 
 INTERFACE mcclock;
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index f2d1c2209216..53af9d0ea1f2 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -40,7 +40,7 @@
  */
 
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.8 1999/12/29 04:35:35 peter Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index 474eb8838b04..97327251c4b0 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_control.c,v 1.16 1999/09/25 18:23:48 phk Exp $"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 9fc558bed4ec..8fe2fa28c048 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.12 2000/01/29 14:31:57 peter Exp $
  */
 
 #include "opt_dpt.h"
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 884b6b657809..1e1260db6704 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.17 1999/10/09 03:46:28 mdodd Exp $"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_pci.h b/sys/dev/dpt/dpt_pci.h
index fe7206a1882d..7d42553c32f7 100644
--- a/sys/dev/dpt/dpt_pci.h
+++ b/sys/dev/dpt/dpt_pci.h
@@ -28,7 +28,7 @@
  *
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_pci.h,v 1.2 1999/08/28 00:50:46 peter Exp $"
 
 #define DPT_VENDOR_ID             0x00001044
 #define DPT_DEVICE_ID             0x0000a400
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 86449f04cfa4..9801c9054055 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -43,7 +43,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.28 1999/10/09 03:39:47 mdodd Exp $"
 
 #define _DPT_C_
 
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 44b714c5d969..dcf61e7e97c9 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.173.2.7 2000/07/17 21:24:25 archie Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index 8894fda35292..26e6445da40b 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.5 1999/11/20 09:28:01 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 9d5fb7f239d4..8a1a45b9488d 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.9.2.3 2000/07/17 21:24:25 archie Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 0a4b0cb52bfb..78e49405f417 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.23 1999/11/20 09:28:01 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 2d06ef5e9a03..0703dcb998e7 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_edreg.h,v 1.27 1999/09/02 15:06:23 kato Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index 85170b6b912a..8cc766a64e35 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.4.2.1 2000/07/01 05:51:38 ps Exp $
  */
 
 /*
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 1e9dcda367ba..c26c32967f5d 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.55 2000/01/14 07:13:57 peter Exp $
  */
 
 #include "opt_eisa.h"
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 8330bb4a7353..acaff495a303 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/eisa/eisaconf.h,v 1.20 1999/08/28 00:43:39 peter Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 410d2f3fa32f..00bf0ae119fb 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/en/midway.c,v 1.19 2000/01/29 14:38:04 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index b4a0eb785563..902c8016bcbf 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.2 2000/07/17 21:24:26 archie Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index b8bc31d3f497..0974506fc589 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.18 2000/01/14 07:14:00 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index a4e9ac6eec79..555cd3b53aea 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ep/if_ep_isa.c,v 1.8 2000/01/23 08:46:21 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c
index 778b42b27f31..157f347a5c0e 100644
--- a/sys/dev/ep/if_ep_mca.c
+++ b/sys/dev/ep/if_ep_mca.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/dev/ep/if_ep_mca.c,v 1.2 1999/10/27 06:25:15 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 85092b74f35f..ba9c4c67c37f 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/ep/if_ep_pccard.c,v 1.12.2.1 2000/07/17 21:24:26 archie Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 5fa60aad0edf..b4e4d6c5e0a2 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR 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/dev/ep/if_epreg.h,v 1.29 2000/01/12 06:42:49 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 21cceae488be..11b3e6cc8230 100644
--- a/sys/dev/ep/if_epvar.h
+++ b/sys/dev/ep/if_epvar.h
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR 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/dev/ep/if_epvar.h,v 1.4.2.1 2000/05/24 01:47:45 archie Exp $
  */
 
 struct ep_board {
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 54eca7bfeabc..58a120fc8460 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.2 2000/07/17 21:24:26 archie Exp $
  *
  * MAINTAINER: Matthew N. Dodd <winter@jurai.net>
  *                             <mdodd@FreeBSD.org>
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 86ce59b96f38..e1ef14a206fa 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/fb/fb.c,v 1.11.2.1 2000/05/21 01:19:38 gallatin Exp $
  */
 
 #include "fb.h"
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 7070f19d52f4..61f264f25879 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/fb/fbreg.h,v 1.6 1999/12/29 04:35:36 peter Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index c71e017ff7e8..2e4d128034c5 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/fb/splash.c,v 1.8 2000/01/29 14:42:57 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index b0c761562350..746b4aabcaa3 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/fb/splashreg.h,v 1.4 1999/08/28 00:41:41 peter Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index eafffea4889f..b608020a480b 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/fb/vga.c,v 1.9 2000/01/29 14:43:47 peter Exp $
  */
 
 #include "opt_vga.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index d50e5f2caaa9..5b1452941f90 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/fb/vgareg.h,v 1.4 1999/12/29 04:35:37 peter Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index ca7e2a3aad73..ee0a13816b6c 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.10 1999/08/28 00:41:42 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.10 1999/08/28 00:41:42 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index e44a2a9f43e6..e76e195f6afa 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.2 1999/08/28 00:41:43 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 1051dd499350..fced89384c31 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.5 1999/08/28 00:41:43 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.5 1999/08/28 00:41:43 peter Exp $");
 #endif
 
 static int	eni_test_memory __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index 684fdb1432e2..02d87835da0b 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.5 2000/01/17 20:49:41 mks Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <dev/hea/eni.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.5 2000/01/17 20:49:41 mks Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 08ce89a63ce2..2f2aad03c99f 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.5 1999/08/28 00:41:44 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.5 1999/08/28 00:41:44 peter Exp $");
 #endif
 
 static void	eni_get_stats __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index 996c0eccb9a1..7b3a95222da0 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_init.c,v 1.3 1999/08/28 00:41:44 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_init.c,v 1.3 1999/08/28 00:41:44 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index cbf7ef02eaa8..c00ef9dea9cf 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.4 1999/08/28 00:41:44 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.4 1999/08/28 00:41:44 peter Exp $");
 #endif
 
 static void	eni_suni_intr __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 2722233afd8a..c98057fdca9f 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.5 1999/08/28 00:41:45 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.5 1999/08/28 00:41:45 peter Exp $");
 #endif
 
 static void	eni_recv_stack __P((void *, KBuffer *));
diff --git a/sys/dev/hea/eni_stats.h b/sys/dev/hea/eni_stats.h
index ddcc55ff775c..a9b1175e0439 100644
--- a/sys/dev/hea/eni_stats.h
+++ b/sys/dev/hea/eni_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_stats.h,v 1.2 1999/08/28 00:41:46 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_suni.h b/sys/dev/hea/eni_suni.h
index 3ebce6030679..02e426a0d665 100644
--- a/sys/dev/hea/eni_suni.h
+++ b/sys/dev/hea/eni_suni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_suni.h,v 1.2 1999/08/28 00:41:46 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 2e2960ad3898..db4218f067b4 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_transmit.c,v 1.6 1999/12/21 08:24:35 eivind Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_transmit.c,v 1.6 1999/12/21 08:24:35 eivind Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_var.h b/sys/dev/hea/eni_var.h
index f13a99d94fab..42ff7f36d1b4 100644
--- a/sys/dev/hea/eni_var.h
+++ b/sys/dev/hea/eni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.2 1999/08/28 00:41:46 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index d552ddf89a18..36a58d643208 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_vcm.c,v 1.3 1999/08/28 00:41:47 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_vcm.c,v 1.3 1999/08/28 00:41:47 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 04099824075e..c46a706ecd41 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore.h,v 1.2 1999/08/28 00:41:48 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index c5bf8038f1a3..fb7bf695ce97 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_aali.h,v 1.2 1999/08/28 00:41:48 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 2c22e4283d5a..8021b5910511 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.5 2000/01/15 21:01:04 mks Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.5 2000/01/15 21:01:04 mks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index 5823a3623c5d..6103bec07b8c 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.6 1999/08/28 00:41:49 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.6 1999/08/28 00:41:49 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index ff8cc6c2e949..2795d2703fe9 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.4 1999/08/28 00:41:49 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.4 1999/08/28 00:41:49 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 930e0f9f0ec9..2b8276a56fb4 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.5 1999/08/28 00:41:49 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.5 1999/08/28 00:41:49 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index 4ffe4ce424c6..57b3fcc42841 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.2 1999/08/28 00:41:50 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index d0e6192ff479..a6e3d1bcc0be 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.6 1999/08/29 10:28:09 bde Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.6 1999/08/29 10:28:09 bde Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index aa7f05cce99a..0dcd881aef0d 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.3 1999/08/28 00:41:50 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.3 1999/08/28 00:41:50 peter Exp $");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 5f136c8e1eb7..09e62957e5c7 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.13 1999/09/25 18:23:49 phk Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.13 1999/09/25 18:23:49 phk Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index b0b54362a046..720c427ee93c 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.5 2000/01/15 21:01:04 mks Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.5 2000/01/15 21:01:04 mks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index be07791aae6e..8a0f89e5ee05 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.5 1999/08/28 00:41:51 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.5 1999/08/28 00:41:51 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 9f7d3224fcb4..28ab67873622 100644
--- a/sys/dev/hfa/fore_slave.h
+++ b/sys/dev/hfa/fore_slave.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_slave.h,v 1.2 1999/08/28 00:41:52 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index a01c5e50f6a7..dca84a3486f8 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.4 1999/08/28 00:41:52 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.4 1999/08/28 00:41:52 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 53b568f69ebd..c720efdcdd3b 100644
--- a/sys/dev/hfa/fore_stats.h
+++ b/sys/dev/hfa/fore_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.h,v 1.2 1999/08/28 00:41:52 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index df5cff86b42a..261614568b41 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.3 1999/08/28 00:41:52 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.3 1999/08/28 00:41:52 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index 45445d420313..bb719b117e4a 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.4 1999/08/28 00:41:53 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.4 1999/08/28 00:41:53 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 5a1533f3c2c6..18a81171c150 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.2 1999/08/28 00:41:53 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index e2bc530ef5e3..3300de100153 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.4 1999/08/28 00:41:53 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.4 1999/08/28 00:41:53 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index dd338b6837d4..8e2e7915762e 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/ida.c,v 1.7.2.1 2000/05/03 23:54:08 jlemon Exp $
  */
 
 /*
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 41174cf4f9c4..472a7947442e 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.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/dev/ida/ida_disk.c,v 1.12.2.2 2000/05/03 23:54:08 jlemon Exp $
  */
 
 /*
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index fd3fd29e2015..ccd12eca03b5 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/ida_eisa.c,v 1.1.2.1 2000/04/16 14:14:29 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index ca37b4c86401..91bbb6dc2a14 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.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/dev/ida/ida_pci.c,v 1.7.2.2 2000/05/23 19:30:35 jlemon Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index 3ba79522907d..ef7fe6fab08b 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.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/dev/ida/idareg.h,v 1.3.2.1 2000/04/16 14:14:29 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 8f5a4deab56b..f470c3b5c321 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.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/dev/ida/idavar.h,v 1.3.2.1 2000/05/03 23:54:09 jlemon Exp $
  */
 
 /*
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 4d3c9fbfbc97..5c68eb7de765 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.2 2000/07/17 21:24:27 archie Exp $
  */
 
 /*
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 9be1396cf49e..f6ab2adb91b1 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ie507.h,v 1.4 1999/08/28 00:44:47 peter Exp $
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index 875f63ca9dbb..f322ce01707a 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_iereg.h,v 1.4 1999/08/28 00:44:47 peter Exp $
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 2342956f4b1e..48429a110c7f 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.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/dev/iicbus/if_ic.c,v 1.8 1999/12/29 04:35:39 peter Exp $
  */
 
 /*
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 0482adff181a..602583bfba53 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.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/dev/iicbus/iic.c,v 1.18 1999/11/18 05:43:32 peter Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index b4e4f63276d2..dd5d4f9d8c0b 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.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/dev/iicbus/iicbb.c,v 1.6 1999/08/28 00:41:58 peter Exp $
  *
  */
 
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index a99bfe86b888..86d5abed260e 100644
--- a/sys/dev/iicbus/iicbb_if.m
+++ b/sys/dev/iicbus/iicbb_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbb_if.m,v 1.3 1999/08/28 00:41:58 peter Exp $
 #
 
 INTERFACE iicbb;
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 45a32d4d1a3b..123f2d96b37d 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.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/dev/iicbus/iicbus.c,v 1.13 1999/12/03 08:41:02 mdodd Exp $
  *
  */
 
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 59bbaef4d3fe..a97af7f6275f 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.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/dev/iicbus/iicbus.h,v 1.4 1999/08/28 00:41:58 peter Exp $
  *
  */
 #ifndef __IICBUS_H
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index ba30c61e0b9f..da9526da32e9 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbus_if.m,v 1.4 1999/08/28 00:41:59 peter Exp $
 #
 
 INTERFACE iicbus;
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 1fc07bf3b3f7..0d1f1f846fd1 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.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/dev/iicbus/iiconf.c,v 1.10 1999/12/03 08:41:02 mdodd Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 03a4a762efd5..d18a68bdc535 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.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/dev/iicbus/iiconf.h,v 1.6 1999/08/28 00:41:59 peter Exp $
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index f967551a9d4d..382bfe19bde1 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.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/dev/iicbus/iicsmb.c,v 1.5 1999/08/28 00:41:59 peter Exp $
  *
  */
 
diff --git a/sys/dev/isp/MAINTAINER b/sys/dev/isp/MAINTAINER
index be95ab6dd9d5..8de186a11c08 100644
--- a/sys/dev/isp/MAINTAINER
+++ b/sys/dev/isp/MAINTAINER
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/isp/MAINTAINER,v 1.1 2000/01/13 18:45:14 mjacob Exp $
 MAINTAINER = mjacob@freebsd.org
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index 4ee5d47821ce..e6df195c709a 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.41.2.4 2000/07/18 06:47:19 mjacob Exp $ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index f4318687b237..fc22be635b13 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.32.2.4 2000/07/18 07:03:42 mjacob Exp $ */
 /*
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
  *
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 1715fb909c67..c5e24efee5f1 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.26.2.2 2000/07/04 02:26:34 mjacob Exp $ */
 /*
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *---------------------------------------
diff --git a/sys/dev/isp/isp_inline.h b/sys/dev/isp/isp_inline.h
index c6be127cde3c..f2c856a72dc0 100644
--- a/sys/dev/isp/isp_inline.h
+++ b/sys/dev/isp/isp_inline.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.6.2.2 2000/07/18 07:20:53 mjacob Exp $ */
 /*
  * Qlogic Host Adapter Inline Functions
  *
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index a099849cd0c0..23daf620c3a0 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.5.4.3 2000/07/18 07:05:58 mjacob Exp $ */
 /*
  * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
  *
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index 862a717ef90f..29099bf4fe17 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.3.4.3 2000/07/18 07:07:26 mjacob Exp $ */
 /*
  * Qlogic Target Mode Structure and Flag Definitions
  *
diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index d5e886fb1b41..ef532bb3c860 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.2.4.1 2000/05/09 05:09:25 mjacob Exp $ */
 /*
  * Qlogic ISP Host Adapter Public Target Interface Structures && Routines
  *---------------------------------------
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 86f5bda21bdc..3bb0a9d97914 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.20.2.2 2000/07/04 02:29:24 mjacob Exp $ */
 /*
  * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 44a8e1d9a750..69df9c3cf295 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispreg.h,v 1.13.2.2 2000/07/04 02:30:09 mjacob Exp $ */
 /*
  * Machine Independent (well, as best as possible) register
  * definitions for Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 763f01e196f8..c041d93c6dc6 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.25.2.2 2000/07/04 02:31:19 mjacob Exp $ */
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/ispfw/MAINTAINER b/sys/dev/ispfw/MAINTAINER
index bc6164b5de5c..517de449b7a1 100644
--- a/sys/dev/ispfw/MAINTAINER
+++ b/sys/dev/ispfw/MAINTAINER
@@ -1,2 +1,2 @@
-$FreeBSD$ 
+$FreeBSD: src/sys/dev/ispfw/MAINTAINER,v 1.1.2.1 2000/07/04 02:34:49 mjacob Exp $ 
 MAINTAINER = mjacob@freebsd.org
diff --git a/sys/dev/ispfw/asm_1040.h b/sys/dev/ispfw/asm_1040.h
index 35980797325d..1b004419e20c 100644
--- a/sys/dev/ispfw/asm_1040.h
+++ b/sys/dev/ispfw/asm_1040.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1040.h,v 1.1.2.2 2000/07/18 07:24:00 mjacob Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1080.h b/sys/dev/ispfw/asm_1080.h
index 7a2899d577a5..798ec2bca025 100644
--- a/sys/dev/ispfw/asm_1080.h
+++ b/sys/dev/ispfw/asm_1080.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1080.h,v 1.1.2.1 2000/07/04 02:07:51 mjacob Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_12160.h b/sys/dev/ispfw/asm_12160.h
index 280e609de44e..c8ab81b4d832 100644
--- a/sys/dev/ispfw/asm_12160.h
+++ b/sys/dev/ispfw/asm_12160.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_12160.h,v 1.2.2.1 2000/07/04 02:07:52 mjacob Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2100.h b/sys/dev/ispfw/asm_2100.h
index 8e3379528d96..0ec3e1bd74e3 100644
--- a/sys/dev/ispfw/asm_2100.h
+++ b/sys/dev/ispfw/asm_2100.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2100.h,v 1.2.2.1 2000/07/04 02:07:52 mjacob Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2200.h b/sys/dev/ispfw/asm_2200.h
index ff90aaf0c011..1a035e7ece31 100644
--- a/sys/dev/ispfw/asm_2200.h
+++ b/sys/dev/ispfw/asm_2200.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2200.h,v 1.2.2.1 2000/07/04 02:07:52 mjacob Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index 76eb992cbd6c..ae7919d6c580 100644
--- a/sys/dev/ispfw/ispfw.c
+++ b/sys/dev/ispfw/ispfw.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.2.2.1 2000/07/04 02:07:52 mjacob Exp $ */
 /*
  * ISP Firmware Helper Pseudo Device for FreeBSD
  *
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 497d267bc272..426c3a76252c 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/kbd/atkbd.c,v 1.25.2.2 2000/05/28 12:48:22 ache Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index 176ca666bc66..78c4f49f5fe9 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.5.2.1 2000/03/31 12:51:56 yokota Exp $
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index 294ef6f8ff7f..255b27d93971 100644
--- a/sys/dev/kbd/atkbdcreg.h
+++ b/sys/dev/kbd/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/atkbdcreg.h,v 1.4.2.2 2000/03/31 12:51:57 yokota Exp $
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index 4ae93e3b96ff..a7e1f7d7174d 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/atkbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/kbd/atkbdreg.h,v 1.5.2.1 2000/03/31 12:51:57 yokota Exp $
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index ba436be2c202..f304a3a3e67f 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/kbd/kbd.c,v 1.17 2000/01/29 15:08:52 peter Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 54b2d6d4089d..f4f6d5511428 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/kbd/kbdreg.h,v 1.9 2000/01/11 13:39:05 yokota Exp $
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 817ac8e52819..eebc20825275 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/kbd/kbdtables.h,v 1.47.2.1 2000/03/19 08:07:09 nyan Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c
index bb1c4f952d52..e66eb402d813 100644
--- a/sys/dev/mca/mca_bus.c
+++ b/sys/dev/mca/mca_bus.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/dev/mca/mca_bus.c,v 1.7.2.1 2000/03/17 23:55:48 peter Exp $
  */
 
 /*
diff --git a/sys/dev/mca/mca_busreg.h b/sys/dev/mca/mca_busreg.h
index e818b68b8023..6b9324ec4191 100644
--- a/sys/dev/mca/mca_busreg.h
+++ b/sys/dev/mca/mca_busreg.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/dev/mca/mca_busreg.h,v 1.1 1999/09/03 03:40:00 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/mca/mca_busvar.h b/sys/dev/mca/mca_busvar.h
index db11d67699f6..6555c47f4298 100644
--- a/sys/dev/mca/mca_busvar.h
+++ b/sys/dev/mca/mca_busvar.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/dev/mca/mca_busvar.h,v 1.2 1999/09/26 07:02:05 mdodd Exp $
  */
 
 typedef u_int16_t mca_id_t;
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 2cc145b939a4..8942346f40b5 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/md/md.c,v 1.8.2.1 2000/07/17 13:48:40 sheldonh Exp $
  *
  */
 
diff --git a/sys/dev/mii/Makefile.miidevs b/sys/dev/mii/Makefile.miidevs
index 964ecf3839b5..d8328029c3c9 100644
--- a/sys/dev/mii/Makefile.miidevs
+++ b/sys/dev/mii/Makefile.miidevs
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.miidevs,v 1.1 1998/08/10 23:55:17 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/mii/Makefile.miidevs,v 1.2 1999/08/28 00:42:12 peter Exp $
 
 AWK=	awk
 
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 91eb7076ea0a..43bad23efc5c 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.2 1999/09/19 21:56:08 wpaul Exp $
  */
 
 /*
@@ -58,7 +58,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/amphy.c,v 1.2 1999/09/19 21:56:08 wpaul Exp $";
 #endif
 
 static int amphy_probe		__P((device_t));
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index ffc362a8c7b1..8b87a39557ac 100644
--- a/sys/dev/mii/amphyreg.h
+++ b/sys/dev/mii/amphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/amphyreg.h,v 1.1 1999/09/06 05:27:55 wpaul Exp $
  */
 
 #ifndef _DEV_MII_AMTPHYREG_H_
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 06a61d5f0ccd..47fac5925902 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.1 2000/04/27 14:43:41 wpaul Exp $
  */
 
 /*
@@ -59,7 +59,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.1 2000/04/27 14:43:41 wpaul Exp $";
 #endif
 
 static int brgphy_probe		__P((device_t));
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index ce289cdf0274..a03fa2e9ae2a 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/brgphyreg.h,v 1.1.2.1 2000/04/27 14:43:41 wpaul Exp $
  */
 
 #ifndef _DEV_MII_BRGPHYREG_H_
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 73e241e8f5cc..11c1a513832d 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/dcphy.c,v 1.2.2.1 2000/06/07 17:11:23 wpaul Exp $
  */
 
 /*
@@ -72,7 +72,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/dcphy.c,v 1.2.2.1 2000/06/07 17:11:23 wpaul Exp $";
 #endif
 
 #define DC_SETBIT(sc, reg, x)                           \
diff --git a/sys/dev/mii/devlist2h.awk b/sys/dev/mii/devlist2h.awk
index 6c76b17a4ab8..db8b31af09fa 100644
--- a/sys/dev/mii/devlist2h.awk
+++ b/sys/dev/mii/devlist2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR 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/dev/mii/devlist2h.awk,v 1.3 1999/08/28 02:21:15 peter Exp $
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 30b6b6310d50..1fca06c602bd 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -89,7 +89,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/exphy.c,v 1.4 1999/09/01 17:07:27 wpaul Exp $";
 #endif
 
 static int exphy_probe		__P((device_t));
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index b3f40e29ddca..7ccb5747a113 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -60,7 +60,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/mii.c,v 1.6 1999/12/03 08:41:03 mdodd Exp $";
 #endif
 
 static int miibus_readreg	__P((device_t, int, int));
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index c21fe0377085..94523e86281a 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -31,7 +31,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/mii/mii.h,v 1.2 1999/08/28 00:42:14 peter Exp $
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index ff4719050930..722466586683 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -61,7 +61,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/mii_physubr.c,v 1.2 1999/08/28 00:42:14 peter Exp $";
 #endif
 
 void	mii_phy_auto_timeout __P((void *));
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index d540964cb102..cca2bcbe317f 100644
--- a/sys/dev/mii/miibus_if.m
+++ b/sys/dev/mii/miibus_if.m
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/mii/miibus_if.m,v 1.2 1999/08/28 00:42:14 peter Exp $
 
 INTERFACE miibus;
 
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 917050c1a885..579d0d291312 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.4.2.1 2000/04/27 14:42:26 wpaul Exp $
 /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
 
 /*-
diff --git a/sys/dev/mii/miidevs.h b/sys/dev/mii/miidevs.h
index 292b4d08d850..ff28e0d29bd6 100644
--- a/sys/dev/mii/miidevs.h
+++ b/sys/dev/mii/miidevs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/miidevs.h,v 1.4.2.1 2000/04/27 14:42:48 wpaul Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 4a68b9c7cf25..0f1282457bcd 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/miivar.h,v 1.3 1999/12/29 04:35:41 peter Exp $
  */
 
 #ifndef _DEV_MII_MIIVAR_H_
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 91e0ffb28bde..1dd6715c7616 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/mlphy.c,v 1.2.2.1 2000/04/14 15:33:14 wpaul Exp $
  */
 
 /*
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 4c58a4e5d1e9..da7224d5ba71 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -93,7 +93,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.2 1999/08/28 00:42:15 peter Exp $";
 #endif
 
 static int nsphy_probe		__P((device_t));
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index 5ff0490b1dfe..5e8d3478e854 100644
--- a/sys/dev/mii/nsphyreg.h
+++ b/sys/dev/mii/nsphyreg.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/nsphyreg.h,v 1.2 1999/08/28 00:42:16 peter Exp $
  */
 
 #ifndef _DEV_MII_NSPHYREG_H_
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 0f8498ef6ff6..d932df87d59a 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1 1999/12/04 17:41:31 wpaul Exp $
  */
 
 /*
@@ -69,7 +69,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1 1999/12/04 17:41:31 wpaul Exp $";
 #endif
 
 #define DC_SETBIT(sc, reg, x)                           \
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 956160d23516..3c1181cbf69f 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2 1999/09/01 17:07:27 wpaul Exp $
  */
 
 /*
@@ -53,7 +53,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-   "$FreeBSD$";
+   "$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2 1999/09/01 17:07:27 wpaul Exp $";
 #endif
 
 static int rlphy_probe		__P((device_t));
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index f4e3ba8b736c..acebf160bd2c 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -94,7 +94,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.2 1999/08/28 02:16:30 peter Exp $";
 #endif
 
 struct tlphy_softc {
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index 77e4a45700bd..0ae83e34d7e8 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/mii/tlphyreg.h,v 1.2 1999/08/28 02:16:30 peter Exp $
  */
 
 #ifndef _DEV_MII_TLPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index cb22eab1cefe..ad27e994e207 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -91,7 +91,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.2 1999/08/28 00:42:16 peter Exp $";
 #endif
 
 static int ukphy_probe		__P((device_t));
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index d39ef4651b93..4c11bb34c176 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -59,7 +59,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/ukphy_subr.c,v 1.2 1999/08/28 00:42:16 peter Exp $";
 #endif
 
 /*
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index bf6aa3e033d8..6bb7462371f0 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/xmphy.c,v 1.1.2.1 2000/04/27 14:43:41 wpaul Exp $
  */
 
 /*
@@ -60,7 +60,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.1.2.1 2000/04/27 14:43:41 wpaul Exp $";
 #endif
 
 static int xmphy_probe		__P((device_t));
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 1dff3a54d77c..a8cfbd4636f3 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/xmphyreg.h,v 1.1.2.1 2000/04/27 14:43:42 wpaul Exp $
  */
 
 #ifndef _DEV_MII_XMPHYREG_H_
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index c236a76bdb4e..a5b16645e86d 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.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/dev/mlx/mlx.c,v 1.14.2.2 2000/04/24 19:40:48 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index ed82db7285ce..5ad80c186b94 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.8.2.3 2000/04/26 01:43:21 billf Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index 6fe9a562126a..4d9e32a95a79 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.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/dev/mlx/mlx_pci.c,v 1.4.2.2 2000/04/24 19:40:49 msmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index f091befad2d0..865253af21d6 100644
--- a/sys/dev/mlx/mlxio.h
+++ b/sys/dev/mlx/mlxio.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/dev/mlx/mlxio.h,v 1.1.2.2 2000/04/24 19:40:49 msmith Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index 382a2fddc931..b88b99911f68 100644
--- a/sys/dev/mlx/mlxreg.h
+++ b/sys/dev/mlx/mlxreg.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/dev/mlx/mlxreg.h,v 1.5.2.2 2000/04/24 19:40:50 msmith Exp $
  */
 
 #define MLX_BLKSIZE	512		/* fixed feature */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 5115b177c6a6..f5ca97977349 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.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/dev/mlx/mlxvar.h,v 1.5.2.2 2000/04/24 19:40:50 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/pccard/Makefile.pccarddevs b/sys/dev/pccard/Makefile.pccarddevs
index bd25c7dcede3..edf46246578f 100644
--- a/sys/dev/pccard/Makefile.pccarddevs
+++ b/sys/dev/pccard/Makefile.pccarddevs
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.pcmciadevs,v 1.1 1998/07/19 17:28:15 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/Makefile.pccarddevs,v 1.1 1999/10/26 06:52:28 imp Exp $
 
 AWK=	awk
 
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index ab6570fe6c3b..5a9080af1b44 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.1.2.1 2000/05/23 03:56:59 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccard/devlist2h.awk b/sys/dev/pccard/devlist2h.awk
index f5863977751b..dee82e9f016a 100644
--- a/sys/dev/pccard/devlist2h.awk
+++ b/sys/dev/pccard/devlist2h.awk
@@ -1,6 +1,6 @@
 #! /usr/bin/awk -f
 #	$NetBSD: devlist2h.awk,v 1.3 1998/09/05 14:42:06 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/devlist2h.awk,v 1.1 1999/10/26 06:52:28 imp Exp $
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/sys/dev/pccard/files.pccard b/sys/dev/pccard/files.pccard
index 09bf525c7ad3..557b0aae52aa 100644
--- a/sys/dev/pccard/files.pccard
+++ b/sys/dev/pccard/files.pccard
@@ -1,5 +1,5 @@
 #	$NetBSD: files.pcmcia,v 1.14 1999/01/01 19:30:03 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/files.pccard,v 1.1 1999/10/26 06:52:29 imp Exp $
 #
 # Config.new file and device description for machine-independent PCMCIA code.
 # Included by ports that need it.
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index c2e62bad993f..970139807999 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmcia.c,v 1.13 1998/12/24 04:51:59 marc Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard.c,v 1.8.2.1 2000/05/23 03:56:59 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index e9220240396e..40ffcdba37b7 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmcia_cis.c,v 1.10 1998/12/29 09:03:15 marc Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.c,v 1.5.2.1 2000/05/23 03:56:59 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 02193837c411..c40a395c7cba 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmcia_cis_quirks.c,v 1.5 1999/10/11 17:50:21 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.2.2.1 2000/05/23 03:57:00 imp Exp $ */
 
 #define	PCCARDDEBUG
 
diff --git a/sys/dev/pccard/pccardchip.h b/sys/dev/pccard/pccardchip.h
index fe8b9363452a..9b5de826c911 100644
--- a/sys/dev/pccard/pccardchip.h
+++ b/sys/dev/pccard/pccardchip.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciachip.h,v 1.4 1999/10/15 06:07:32 haya Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardchip.h,v 1.6 2000/01/10 06:58:17 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 92f57b730a3c..ea397750da17 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.3.2.1 2000/05/23 03:57:00 imp Exp $
 /* $NetBSD: pcmciadevs,v 1.60 1999/11/29 02:28:19 jun Exp $ */
 
 /*-
diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h
index c157c9e9f2c3..da0d3529813e 100644
--- a/sys/dev/pccard/pccarddevs.h
+++ b/sys/dev/pccard/pccarddevs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.3.2.1 2000/05/23 03:57:00 imp Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/pccard/pccarddevs_data.h b/sys/dev/pccard/pccarddevs_data.h
index 49b4d4b1dcf9..6c4b838c6f0b 100644
--- a/sys/dev/pccard/pccarddevs_data.h
+++ b/sys/dev/pccard/pccarddevs_data.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/pccard/pccarddevs_data.h,v 1.3.2.1 2000/05/23 03:57:00 imp Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index a82417a9b544..0fc2a949ffe3 100644
--- a/sys/dev/pccard/pccardreg.h
+++ b/sys/dev/pccard/pccardreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciareg.h,v 1.7 1998/10/29 09:45:52 enami Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardreg.h,v 1.1 1999/10/26 06:52:31 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 19e943437370..414fc6044b68 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciavar.h,v 1.9 1998/12/29 09:00:28 marc Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.6.2.1 2000/05/23 03:57:00 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m
index d661d5c5ccd9..0eafefae4229 100644
--- a/sys/dev/pccard/power_if.m
+++ b/sys/dev/pccard/power_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/power_if.m,v 1.2.2.1 2000/05/23 03:57:00 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pcic/i82365.c b/sys/dev/pcic/i82365.c
index f99e9f392a4b..0f7fe84fdd49 100644
--- a/sys/dev/pcic/i82365.c
+++ b/sys/dev/pcic/i82365.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: i82365.c,v 1.25 1999/10/15 06:07:27 haya Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pcic/i82365.c,v 1.16.2.1 2000/05/23 03:57:02 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pcic/i82365_isa.c b/sys/dev/pcic/i82365_isa.c
index e4a98c3aa632..31ef1c4c0eb5 100644
--- a/sys/dev/pcic/i82365_isa.c
+++ b/sys/dev/pcic/i82365_isa.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i82365_isasubr.c,v 1.3 1999/10/15 06:07:27 haya Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pcic/i82365_isa.c,v 1.13.2.1 2000/05/23 03:57:02 imp Exp $ */
 
 /*
  * Copyright (c) 1998 Bill Sommerfeld.  All rights reserved.
diff --git a/sys/dev/pcic/i82365reg.h b/sys/dev/pcic/i82365reg.h
index 1edfdcd7899a..564695a8126b 100644
--- a/sys/dev/pcic/i82365reg.h
+++ b/sys/dev/pcic/i82365reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pcic/i82365reg.h,v 1.3 2000/03/10 05:26:32 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pcic/i82365var.h b/sys/dev/pcic/i82365var.h
index 5a0c723ad7eb..b2eb371a8304 100644
--- a/sys/dev/pcic/i82365var.h
+++ b/sys/dev/pcic/i82365var.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: i82365var.h,v 1.8 1999/10/15 06:07:27 haya Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pcic/i82365var.h,v 1.15.2.1 2000/05/23 03:57:02 imp Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index dc90631eefa6..96561e38b212 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/pdq/if_fea.c,v 1.19 2000/01/14 07:14:03 peter Exp $
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index d70628a9e708..dc487f87bed4 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/pdq/if_fpa.c,v 1.13 1999/08/28 00:50:50 peter Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 055bdc2f9d28..bc45d21f7551 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/pdq/pdq.c,v 1.5 1999/08/28 00:42:19 peter Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index ea7bdffeaa2d..cc5c0983a70a 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/pdq/pdq_ifsubr.c,v 1.11 2000/01/13 09:13:22 mdodd Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index f3cfa84fdcb5..650fd223a5ab 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/pdq/pdqreg.h,v 1.2 1999/08/28 00:42:20 peter Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 8320eaec69f9..febcd9a86d54 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/pdq/pdqvar.h,v 1.3 1999/08/28 00:42:21 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 2c7940fc02a0..b4ce9d9ff92d 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.19.2.1 2000/05/24 00:20:57 n_hibma Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 7a9b503db601..481666af4387 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.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/dev/ppbus/immio.c,v 1.10.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 9132b478997b..641330cb20ca 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.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/dev/ppbus/lpbb.c,v 1.11.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 04e161dba274..8e1c88ac7805 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.15.2.3 2000/07/07 00:30:40 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 9075b4ec6e5a..da1a527ee5b8 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -34,7 +34,7 @@
  *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp 
  *	From Id: nlpt.h,v 1.3 1999/01/10 12:04:54 nsouch Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpt.h,v 1.4 1999/08/28 00:42:23 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 8458bc6bd357..6e2943e1ca94 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lptio.h,v 1.8.2.1 2000/07/07 00:30:40 obrien Exp $
  */
 
 #ifndef	_DEV_PPBUS_LPT_H_
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index c82e5dc53f05..753b4df98fc9 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -21,7 +21,7 @@
  * NEGLIGENCE OR 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/dev/ppbus/pcfclock.c,v 1.3.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 47ee046c2435..61623f0f04ca 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.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/dev/ppbus/ppb_1284.c,v 1.11 2000/01/14 08:03:14 nsouch Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index 5c4010f88bf5..39657494dd7c 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.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/dev/ppbus/ppb_1284.h,v 1.7 2000/01/14 08:03:14 nsouch Exp $
  *
  */
 #ifndef __1284_H
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index c2f1d9b1fd2e..312375235e18 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.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/dev/ppbus/ppb_base.c,v 1.10 2000/01/14 00:17:54 nsouch Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 61c325c63605..2d14ff095357 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.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/dev/ppbus/ppb_msq.c,v 1.9.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 #include <machine/stdarg.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 64d16d895419..38cb9bc95568 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.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/dev/ppbus/ppb_msq.h,v 1.8 2000/01/14 00:17:55 nsouch Exp $
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 15d02eda5969..2c0710ec9333 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.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/dev/ppbus/ppbconf.c,v 1.17.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 #include "opt_ppb_1284.h"
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 96b7b1bf15c9..def5c0bfeee2 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.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/dev/ppbus/ppbconf.h,v 1.17.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppbio.h b/sys/dev/ppbus/ppbio.h
index 2794eddc1dea..b288fc892ed5 100644
--- a/sys/dev/ppbus/ppbio.h
+++ b/sys/dev/ppbus/ppbio.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/dev/ppbus/ppbio.h,v 1.1 2000/01/14 00:17:57 nsouch Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/ppbus_if.m b/sys/dev/ppbus/ppbus_if.m
index f21dd837568b..e21167363305 100644
--- a/sys/dev/ppbus/ppbus_if.m
+++ b/sys/dev/ppbus/ppbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/ppbus/ppbus_if.m,v 1.1.2.1 2000/05/24 00:20:57 n_hibma Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 032823b45356..c3bd66dd32b0 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.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/dev/ppbus/ppi.c,v 1.21.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 #include "opt_ppb_1284.h"
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 8ff2fb48c4ad..e5b9994cdbce 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.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/dev/ppbus/ppi.h,v 1.5 1999/12/29 04:35:43 peter Exp $
  *
  */
 #ifndef __PPI_H
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 1ccf01513d23..56591fb7fd84 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/pps.c,v 1.24.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 1d6d4a242d32..7bc8317071d6 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.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/dev/ppbus/vpo.c,v 1.20.2.1 2000/05/07 21:08:18 n_hibma Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 0feb9bb4ac47..27dc737218ed 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.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/dev/ppbus/vpoio.c,v 1.10.2.1 2000/05/24 00:20:57 n_hibma Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index 211ca00e54d8..10ddae1262f7 100644
--- a/sys/dev/ppbus/vpoio.h
+++ b/sys/dev/ppbus/vpoio.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/dev/ppbus/vpoio.h,v 1.4 2000/01/14 00:17:59 nsouch Exp $
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 603dcf698d08..cae7f445cf0f 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si.c,v 1.101 2000/01/25 16:45:54 peter Exp $
  */
 
 #ifndef lint
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index a0c1ebdb1118..960ac8e52e8f 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si.h,v 1.16 2000/01/24 07:24:00 peter Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/si2_z280.c b/sys/dev/si/si2_z280.c
index d2e1d21ed882..95b8f46e8447 100644
--- a/sys/dev/si/si2_z280.c
+++ b/sys/dev/si/si2_z280.c
@@ -25,7 +25,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si2_z280.c,v 1.4 2000/01/24 07:24:00 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/si/si3_t225.c b/sys/dev/si/si3_t225.c
index 98687e087171..cb9488ee2d54 100644
--- a/sys/dev/si/si3_t225.c
+++ b/sys/dev/si/si3_t225.c
@@ -25,7 +25,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si3_t225.c,v 1.6 2000/01/25 16:45:54 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c
index 307950396bdd..8863e6cd5057 100644
--- a/sys/dev/si/si_eisa.c
+++ b/sys/dev/si/si_eisa.c
@@ -17,7 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si_eisa.c,v 1.1 2000/01/24 07:24:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c
index ec1a62c6a5c2..38c29ff028e1 100644
--- a/sys/dev/si/si_isa.c
+++ b/sys/dev/si/si_isa.c
@@ -17,7 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si_isa.c,v 1.1 2000/01/24 07:24:01 peter Exp $
  */
 
 #include "opt_debug_si.h"
diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c
index 96a865c5dfa6..06d735af50cc 100644
--- a/sys/dev/si/si_pci.c
+++ b/sys/dev/si/si_pci.c
@@ -17,7 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si_pci.c,v 1.2 2000/01/24 08:11:10 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 0d59ea9fff62..6c2b2606f800 100644
--- a/sys/dev/si/sireg.h
+++ b/sys/dev/si/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/sireg.h,v 1.9 2000/01/23 22:51:49 peter Exp $
  */
 
 /*
diff --git a/sys/dev/si/sivar.h b/sys/dev/si/sivar.h
index 4232e76c8019..1d1d463b515d 100644
--- a/sys/dev/si/sivar.h
+++ b/sys/dev/si/sivar.h
@@ -17,7 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/sivar.h,v 1.1 2000/01/24 07:24:02 peter Exp $
  */
 
 int	siattach(device_t dev);
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index c4bd042012e1..f80d6cbd61bd 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.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/dev/smbus/smb.c,v 1.20 1999/11/18 05:44:56 peter Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 1afb7e9f2219..76a9d3a94d20 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.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/dev/smbus/smbconf.c,v 1.9 1999/12/03 08:41:08 mdodd Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index 40289f76a552..2d5f3f74662e 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.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/dev/smbus/smbconf.h,v 1.6 1999/08/28 00:42:29 peter Exp $
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index a1d3634aa7f0..6c056f13b1bc 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.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/dev/smbus/smbus.c,v 1.12 1999/12/03 08:41:08 mdodd Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index 9f96b9dfe172..dadb052f38ed 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.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/dev/smbus/smbus.h,v 1.2 1999/08/28 00:42:30 peter Exp $
  *
  */
 #ifndef __SMBUS_H
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index d520c2b35709..16f6d0b4da76 100644
--- a/sys/dev/smbus/smbus_if.m
+++ b/sys/dev/smbus/smbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/smbus/smbus_if.m,v 1.5 1999/08/28 00:42:30 peter Exp $
 #
 
 INTERFACE smbus;
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 01395e63d011..9f11e2c79de8 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/sn/if_sn.c,v 1.7.2.2 2000/07/17 21:24:27 archie Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index 1ff9de4b1497..d64e88104359 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/sn/if_sn_isa.c,v 1.3 2000/01/22 17:24:16 hosokawa Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index 4220deaf1ece..6a270fa809ad 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/sn/if_sn_pccard.c,v 1.3.2.1 2000/07/17 21:24:28 archie Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_snreg.h b/sys/dev/sn/if_snreg.h
index d8b914d17cb0..140465493668 100644
--- a/sys/dev/sn/if_snreg.h
+++ b/sys/dev/sn/if_snreg.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/sn/if_snreg.h,v 1.2 1999/12/22 08:44:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index 4d7b1d8d1327..86a325c8cbc7 100644
--- a/sys/dev/sn/if_snvar.h
+++ b/sys/dev/sn/if_snvar.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/sn/if_snvar.h,v 1.2 2000/01/22 17:24:16 hosokawa Exp $
  */
 
 #ifndef _IF_SNVAR_H
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 012910c978d3..5acbb18f12df 100644
--- a/sys/dev/sound/chip.h
+++ b/sys/dev/sound/chip.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/dev/sound/chip.h,v 1.2 2000/01/03 02:51:14 tanimura Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index a041ba9ba7c0..78a512afd5e3 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.7.2.2 2000/07/19 21:18:14 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index 078523f1d12e..f10d7cdc539f 100644
--- a/sys/dev/sound/isa/ad1816.h
+++ b/sys/dev/sound/isa/ad1816.h
@@ -4,7 +4,7 @@
  * This file contains information and macro definitions for
  * the ad1816 chip
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.1 1999/09/28 20:00:06 cg Exp $
  */
 
 /* AD1816 register macros */
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index c4e98eaed2b6..6429adcafbfb 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.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/dev/sound/isa/es1888.c,v 1.5.2.2 2000/07/19 21:18:15 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 709549becef9..a4df81d91c6e 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.3.2.1 2000/07/19 21:18:15 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 10a1f0a64ed4..35195298fc9d 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.5.2.1 2000/07/19 21:18:15 cg Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 4e1967f8b02c..19fdda27a687 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.48.2.3 2000/07/19 21:18:15 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index 2491dbd1a13a..44916f33fba5 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -260,7 +260,7 @@ MIX_NONE(SOUND_MIXER_LINE3),
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.7.2.2 2000/07/19 21:18:15 cg Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c
index f984d5c824ec..026c99e26708 100644
--- a/sys/dev/sound/isa/sb.c
+++ b/sys/dev/sound/isa/sb.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/sb.c,v 1.50.2.2 2000/07/19 21:18:15 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index 98a0227857a6..c4e2073f89db 100644
--- a/sys/dev/sound/isa/sb.h
+++ b/sys/dev/sound/isa/sb.h
@@ -1,6 +1,6 @@
 /*
  * file: sbcard.h
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.12 1999/12/19 18:18:55 cg Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 0c2933ba1995..b855acd4193b 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.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/dev/sound/isa/sbc.c,v 1.19.2.3 2000/07/19 21:18:15 cg Exp $
  */
 
 #include <dev/sound/chip.h>
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index e97b689aea3c..8df0f9b97fde 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.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/dev/sound/pci/aureal.c,v 1.8.2.2 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h
index a89e4c9aede5..172b37f996bb 100644
--- a/sys/dev/sound/pci/aureal.h
+++ b/sys/dev/sound/pci/aureal.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/dev/sound/pci/aureal.h,v 1.2 1999/09/01 06:58:27 peter Exp $
  */
 
 #ifndef _AU8820_REG_H
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 7d513115ce76..a7218dc3c6c7 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.8.2.1 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/pci/csaimg.h b/sys/dev/sound/pci/csaimg.h
index 0fb196f5bc65..df06cbea408b 100644
--- a/sys/dev/sound/pci/csaimg.h
+++ b/sys/dev/sound/pci/csaimg.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/dev/sound/pci/csaimg.h,v 1.2 1999/12/10 01:20:07 tanimura Exp $
  */
 
 #ifndef _CSA_IMG_H
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 6eb67c4562c0..cf240d531d31 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.8.2.2 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <sys/soundcard.h>
diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h
index 9fd68d8ea07b..1366ee661611 100644
--- a/sys/dev/sound/pci/csareg.h
+++ b/sys/dev/sound/pci/csareg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csareg.h,v 1.2 1999/12/10 01:20:08 tanimura Exp $
  */
 
 #ifndef _CSA_REG_H
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index fef2ce84d4bc..4e53b042708f 100644
--- a/sys/dev/sound/pci/csavar.h
+++ b/sys/dev/sound/pci/csavar.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/dev/sound/pci/csavar.h,v 1.2 2000/01/03 02:51:16 tanimura Exp $
  */
 
 #ifndef _CSA_VAR_H
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index b69e5b4b410e..380fc0b0afa0 100644..100755
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.h
@@ -6,7 +6,7 @@
  *	Desc:
  * 		micro-code for CTRL & DSP
  * =============================================================================
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1-fw.h,v 1.1.2.1 2000/07/19 21:18:45 cg Exp $
  */
 #ifndef _HWMCODE_
 #define _HWMCODE_
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 61559c80e028..073ddb29a0e9 100644..100755
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.8.2.1 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h
index ad4e829cbfee..50c624093ed2 100644..100755
--- a/sys/dev/sound/pci/ds1.h
+++ b/sys/dev/sound/pci/ds1.h
@@ -5,7 +5,7 @@
  *	author		: Taichi Sugiyama
  *	create Data     : 28/Sep/99
  * =======================================================================
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1.h,v 1.1.2.1 2000/07/19 21:18:45 cg Exp $
  */
 
 
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index e5981857c4d2..96b8b20dd7ca 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.6.2.1 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 0664dbc68f26..c994ea5deefe 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -38,7 +38,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.13.2.2 2000/07/19 21:18:45 cg Exp $
  */
 
 /*
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index 076fe3c01a1b..7e7b447b4b38 100644
--- a/sys/dev/sound/pci/es137x.h
+++ b/sys/dev/sound/pci/es137x.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/es137x.h,v 1.3.2.2 2000/07/19 21:18:45 cg Exp $
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index c9e777b7dffd..4e2a355c0089 100644
--- a/sys/dev/sound/pci/neomagic-coeff.h
+++ b/sys/dev/sound/pci/neomagic-coeff.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.1 2000/01/09 08:14:10 cg Exp $
  */
 
 #define NM_TOTAL_COEFF_COUNT 0x3158
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index f8c5ef0d9693..391c474720bf 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.7.2.3 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index 4e4597e3da95..f155a921fdd4 100644
--- a/sys/dev/sound/pci/neomagic.h
+++ b/sys/dev/sound/pci/neomagic.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic.h,v 1.1 2000/01/09 08:14:11 cg Exp $
  */
 
 #ifndef _NM256_H_
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 01c62206ab38..949caf0e76d3 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.9.2.2 2000/07/19 21:18:45 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index 661c6db4b12d..e59ece9c9793 100644
--- a/sys/dev/sound/pci/t4dwave.h
+++ b/sys/dev/sound/pci/t4dwave.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/dev/sound/pci/t4dwave.h,v 1.3 1999/12/12 02:16:14 cg Exp $
  */
 
 #ifndef _T4DWAVE_REG_H
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 8432769934bf..65442f1ae75d 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.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/dev/sound/pcm/ac97.c,v 1.5.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 11ff139c4849..c2df4252f2b1 100644
--- a/sys/dev/sound/pcm/ac97.h
+++ b/sys/dev/sound/pcm/ac97.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/dev/sound/pcm/ac97.h,v 1.3.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 #define AC97_MUTE	0x8000
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index cb2c9e5a21f8..e7d28e4bdd28 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.19.2.3 2000/07/19 21:18:46 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 23e31df45858..c28a773c592e 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.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/dev/sound/pcm/channel.h,v 1.5.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 int chn_reinit(pcm_channel *c);
diff --git a/sys/dev/sound/pcm/datatypes.h b/sys/dev/sound/pcm/datatypes.h
index 31df62be1d79..2caabed9f598 100644
--- a/sys/dev/sound/pcm/datatypes.h
+++ b/sys/dev/sound/pcm/datatypes.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/dev/sound/pcm/datatypes.h,v 1.8.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 typedef struct _snd_mixer snd_mixer;
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 903de31bb0ce..b7871804f7c6 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.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/dev/sound/pcm/dsp.c,v 1.15.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index c1ce0738c609..f6028e986267 100644
--- a/sys/dev/sound/pcm/dsp.h
+++ b/sys/dev/sound/pcm/dsp.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/dev/sound/pcm/dsp.h,v 1.2 1999/09/01 06:58:22 peter Exp $
  */
 
 int dsp_open(snddev_info *d, int chan, int oflags, int devtype);
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index d3368c0e9e53..f2e4822644de 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.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/dev/sound/pcm/fake.c,v 1.4 2000/01/29 18:48:30 peter Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 5eaf89ad78b7..a78a5eedcb9a 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.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/dev/sound/pcm/feeder.c,v 1.8.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 68e45d970a9a..71610139b015 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.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/dev/sound/pcm/mixer.c,v 1.4.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index a0487d51fd0c..c90e8ceb2727 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.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/dev/sound/pcm/mixer.h,v 1.2.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 extern int mixer_init(snddev_info *d, snd_mixer *m, void *devinfo);
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 71dc8c3a1861..52111cd82b42 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.17.2.2 2000/07/19 21:18:46 cg Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 47720a91ae46..24e78845a929 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.10.2.3 2000/07/19 20:12:58 cg Exp $
  */
 
 /*
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index f4c89e06d0ee..2255b7411b95 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -30,7 +30,7 @@
  * skeleton produced from /usr/share/examples/drivers/make_pseudo_driver.sh
  * in 3.0-980524-SNAP then hacked a bit (but probably not enough :-).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/streams/streams.c,v 1.16 1999/11/08 07:43:54 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sym/README.sym b/sys/dev/sym/README.sym
index a4e19edf416a..12bcd36036c2 100644
--- a/sys/dev/sym/README.sym
+++ b/sys/dev/sym/README.sym
@@ -54,7 +54,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sym/README.sym,v 1.1.1.5.2.1 2000/07/05 20:37:53 groudier Exp $
  */
 
 README.sym
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 2fe71d84ab7a..1f18e296db2a 100644
--- a/sys/dev/sym/sym_conf.h
+++ b/sys/dev/sym/sym_conf.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_conf.h,v 1.4.2.1 2000/05/14 10:46:20 groudier Exp $ */
 
 #ifndef SYM_CONF_H
 #define SYM_CONF_H
diff --git a/sys/dev/sym/sym_defs.h b/sys/dev/sym/sym_defs.h
index d07aa94259c8..6a6f5ea0d210 100644
--- a/sys/dev/sym/sym_defs.h
+++ b/sys/dev/sym/sym_defs.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_defs.h,v 1.4.2.2 2000/06/14 16:14:46 groudier Exp $ */
 
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
diff --git a/sys/dev/sym/sym_fw.h b/sys/dev/sym/sym_fw.h
index 23b7099a627e..05dec1d2217f 100644
--- a/sys/dev/sym/sym_fw.h
+++ b/sys/dev/sym/sym_fw.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw.h,v 1.1.2.1 2000/05/14 10:33:14 groudier Exp $ */
 
 #ifndef	SYM_FW_H
 #define	SYM_FW_H
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index d7b8644dd436..4774f733e7fe 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw1.h,v 1.2.2.2 2000/07/05 20:37:53 groudier Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 494ee17e4547..72701cd61ca3 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw2.h,v 1.2.2.3 2000/07/05 20:37:53 groudier Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index d5d7cd8856de..e5ff5773441b 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.6.2.3 2000/07/05 20:37:53 groudier Exp $ */
 
 #define SYM_DRIVER_NAME	"sym-1.6.4-20000701"
 
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index c4053498acf0..ea75d6843c72 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/schistory.c,v 1.8 2000/01/29 15:08:44 peter Exp $
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index b94980e2d024..e765d1cf7866 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scmouse.c,v 1.12.2.1 2000/04/03 13:03:51 yokota Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
index e7587184734b..d2fb71f4a742 100644
--- a/sys/dev/syscons/scterm-dumb.c
+++ b/sys/dev/syscons/scterm-dumb.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scterm-dumb.c,v 1.2 2000/01/29 15:08:45 peter Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c
index fc555b44b46f..c27802d937bc 100644
--- a/sys/dev/syscons/scterm-sc.c
+++ b/sys/dev/syscons/scterm-sc.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scterm-sc.c,v 1.4.2.6 2000/07/20 13:14:08 ache Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 99fad9857118..9407bfd99794 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scterm.c,v 1.2 2000/01/29 15:08:46 peter Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/sctermvar.h b/sys/dev/syscons/sctermvar.h
index e93699205bac..db3d81de41ec 100644
--- a/sys/dev/syscons/sctermvar.h
+++ b/sys/dev/syscons/sctermvar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/sctermvar.h,v 1.1.2.1 2000/05/29 18:38:33 ache Exp $
  */
 
 #ifndef _DEV_SYSCONS_SCTERMVAR_H_
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 8c498f995f07..2e3df48e5482 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scvesactl.c,v 1.15 2000/01/29 15:08:47 peter Exp $
  */
 
 #include "opt_vga.h"
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 462de90dc397..6f7f31782bf7 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scvgarndr.c,v 1.5.2.2 2000/04/03 13:03:52 yokota Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 8af13a0b0719..7f7d1ea94a8c 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scvidctl.c,v 1.19.2.2 2000/05/05 09:16:08 nyan Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index dc5155b113c8..7af3c2bc462c 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/scvtb.c,v 1.5 2000/01/29 15:08:48 peter Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 0d60d321e8dc..b6d2f9af571f 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/syscons.c,v 1.336.2.2 2000/05/10 02:04:45 obrien Exp $
  */
 
 #include "splash.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 0c1d8e4b5c6d..5310e227bb33 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/syscons.h,v 1.60.2.1 2000/04/03 13:03:54 yokota Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 453215a0af36..8931eed8de50 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/syscons/sysmouse.c,v 1.2 2000/01/29 15:08:49 peter Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 3a7571476b4a..3d1a21894a64 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twe.c,v 1.1.2.1 2000/05/25 01:50:48 msmith Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index fe6dbf67b685..d12c9c3b4fd5 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/twe/twe_compat.h,v 1.1.2.1 2000/05/25 01:50:48 msmith Exp $
  */
 /*
  * Backwards compatibility support for the 4.x branch.
diff --git a/sys/dev/twe/twe_disk.c b/sys/dev/twe/twe_disk.c
index cc49ad103842..77e93757b484 100644
--- a/sys/dev/twe/twe_disk.c
+++ b/sys/dev/twe/twe_disk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/twe/twe_disk.c,v 1.1.2.2 2000/07/20 02:32:35 msmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index 9344280b8443..c10f8f203945 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/twe/twereg.h,v 1.1.2.1 2000/05/25 01:50:48 msmith Exp $
  */
 
 /* 
diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h
index 673a27866c06..130ecb16b8ff 100644
--- a/sys/dev/twe/twevar.h
+++ b/sys/dev/twe/twevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twevar.h,v 1.1.2.1 2000/05/25 01:50:48 msmith Exp $
  */
 
 #ifdef TWE_DEBUG
diff --git a/sys/dev/usb/FILES b/sys/dev/usb/FILES
index 2676b8a350de..95eaf21e7f25 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/FILES,v 1.2 2000/01/27 23:19:14 n_hibma Exp $
 
 A small roadmap of the USB files:
 
diff --git a/sys/dev/usb/Makefile.usbdevs b/sys/dev/usb/Makefile.usbdevs
index 319d066d2859..80b6da996ef3 100644
--- a/sys/dev/usb/Makefile.usbdevs
+++ b/sys/dev/usb/Makefile.usbdevs
@@ -1,6 +1,6 @@
 # The files usbdevs.h and usbdevs_data.h are generated from usbdevs
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/usb/Makefile.usbdevs,v 1.1.2.2 2000/05/07 14:36:41 n_hibma Exp $
 
 AWK=	awk
 UNAME=	uname
diff --git a/sys/dev/usb/devlist2h.awk b/sys/dev/usb/devlist2h.awk
index 6b99b3d0df89..23a47e93591a 100644
--- a/sys/dev/usb/devlist2h.awk
+++ b/sys/dev/usb/devlist2h.awk
@@ -1,6 +1,6 @@
 #! /usr/bin/awk -f
 #	$NetBSD: devlist2h.awk,v 1.6 1999/08/17 16:06:20 augustss Exp $
-#  $FreeBSD$
+#  $FreeBSD: src/sys/dev/usb/devlist2h.awk,v 1.1 1999/11/18 18:02:44 n_hibma Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
 # All rights reserved.
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index b061f2b24f5e..3e38bc06ea15 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.c,v 1.15 2000/04/27 15:26:46 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11.2.3 2000/07/02 11:27:27 n_hibma Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index 5953ce54607f..b62150cbe6b4 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.h,v 1.5 2000/04/27 15:26:46 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.7.2.2 2000/07/02 12:09:16 n_hibma Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 6e46a4dd7581..6c34a1ddec45 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.4 2000/07/17 21:24:28 archie Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.4 2000/07/17 21:24:28 archie Exp $";
 #endif
 
 /*
diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h
index 9e4d5467798a..22410b223876 100644
--- a/sys/dev/usb/if_auereg.h
+++ b/sys/dev/usb/if_auereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_auereg.h,v 1.5 2000/01/28 02:15:30 wpaul Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 3de43640b4e3..c351bf693e48 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.7.2.4 2000/07/17 21:24:28 archie Exp $
  */
 
 /*
@@ -79,7 +79,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.7.2.4 2000/07/17 21:24:28 archie Exp $";
 #endif
 
 /*
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index ca90383ccf49..13d6f01156f0 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/dev/usb/if_cuereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.5 2000/01/28 02:15:30 wpaul Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 780c42bbcbf1..fa87e190f2e2 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.6 2000/07/17 21:24:28 archie Exp $
  */
 
 /*
@@ -95,7 +95,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.6 2000/07/17 21:24:28 archie Exp $";
 #endif
 
 /*
diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h
index 5a315b172d62..6409719f8c23 100644
--- a/sys/dev/usb/if_kuereg.h
+++ b/sys/dev/usb/if_kuereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.5 2000/01/28 02:15:31 wpaul Exp $
  */
 
 /*
diff --git a/sys/dev/usb/kue_fw.h b/sys/dev/usb/kue_fw.h
index 65b34b217c07..04ae7588ded7 100644
--- a/sys/dev/usb/kue_fw.h
+++ b/sys/dev/usb/kue_fw.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/kue_fw.h,v 1.1 2000/01/05 04:27:07 wpaul Exp $
  */
 
 /*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 3ba281a7e76e..c987ad1fd0f0 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohci.c,v 1.64 2000/01/19 00:23:58 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.39.2.3 2000/07/02 11:43:58 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index 053d7f3d3410..fbd1fcafaef6 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcireg.h,v 1.11 2000/01/16 10:35:24 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.13.2.1 2000/07/02 11:43:58 n_hibma Exp $	*/
 
 
 /*
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 8d3777868c67..6c6b2e19cf6c 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcivar.h,v 1.18 2000/01/18 20:11:00 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.15.2.3 2000/07/02 12:42:40 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index e50499596bbf..5b44c6ec59a4 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ugen.c,v 1.27 1999/10/28 12:08:38 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.38.2.3 2000/07/02 11:58:30 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 25b3d2bf918b..fc6ab0c32045 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhci.c,v 1.80 2000/01/19 01:16:38 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.40.2.4 2000/07/02 11:54:39 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index 8178bb12df64..839d87d4424f 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcireg.h,v 1.9 1999/11/20 00:57:09 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.14.2.1 2000/07/02 11:43:59 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 303a429cdc04..4612e584cbf9 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcivar.h,v 1.21 2000/01/18 20:11:01 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.16.2.3 2000/07/02 12:42:40 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 01bba201ef47..a1ccd3e39a3b 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhid.c,v 1.38 2000/04/27 15:26:48 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhid.c,v 1.27.2.3 2000/07/02 12:16:54 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index bd2574344a23..58be74036d17 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhub.c,v 1.34 1999/11/18 23:32:29 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.21.2.3 2000/07/02 12:35:15 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index c3334329d36c..cf8d5f2ad246 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.24.2.2 2000/07/02 11:43:59 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index c5663d2e4582..c7412a11df7c 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ulpt.c,v 1.29 1999/11/17 23:00:50 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.26.2.4 2000/07/02 12:25:31 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 79dbbdf2fc7f..c3644af90529 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/usb/umass.c,v 1.11.2.4 2000/07/02 12:31:42 n_hibma Exp $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 47cbd17df5e3..1b464ec82b34 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/umodem.c,v 1.17.2.3 2000/07/02 11:43:59 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 4e7a2d1956d1..196eea3cb4e7 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ums.c,v 1.36.2.2 2000/07/02 11:43:59 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index a73c993f5210..fc53c5c03b51 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.c,v 1.33 1999/11/22 21:57:09 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb.c,v 1.26.2.3 2000/07/02 12:23:14 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index f82fecdcc999..3106154ed23d 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.h,v 1.38 1999/10/20 21:02:39 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.17.2.4 2000/07/02 12:14:44 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index 2be517540fe4..5b388efd0037 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.4.2.3 2000/05/24 01:47:50 archie Exp $
  */
 
 /*
@@ -69,7 +69,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.4.2.3 2000/05/24 01:47:50 archie Exp $";
 #endif
 
 Static struct ifqueue usbq_rx;
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h
index d98be8c48443..43c43e76699e 100644
--- a/sys/dev/usb/usb_ethersubr.h
+++ b/sys/dev/usb/usb_ethersubr.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/usb_ethersubr.h,v 1.4 2000/01/14 01:36:16 wpaul Exp $
  */
 
 #ifndef _USB_ETHERSUBR_H_
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index c1b27c8a4bec..3e01ae1278c7 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/dev/usb/usb_if.m
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR 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/dev/usb/usb_if.m,v 1.7.2.2 2000/05/07 14:58:03 n_hibma Exp $
 #
 
 # USB interface description
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index d8d29fd81225..16d0a06acf5f 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.h,v 1.9 1999/10/13 08:10:58 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.10.2.1 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index b2a5b3545a36..32614f63f9d7 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_port.h,v 1.15 1999/11/16 12:04:28 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.25.2.3 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 109de72cee0a..2704374bafea 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_quirks.c,v 1.26 2000/04/27 15:26:50 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.21.2.3 2000/07/02 12:19:56 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index db5f8306d4cb..b85b097cde6f 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_quirks.h,v 1.11 2000/04/27 15:26:50 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.11.2.2 2000/07/02 12:21:34 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 4b3ae8203599..84caeb1cd67a 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_subr.c,v 1.63 2000/01/19 00:23:58 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.23.2.2 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index 34a0c94ca0e7..ae8d332fef52 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbcdc.h,v 1.3 1999/01/03 01:09:18 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.7.2.1 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index f9285ad772cb..20af0282c9ae 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.6 2000/06/13 07:58:19 n_hibma Exp $
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index c99140b20b07..963237592ee7 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.32.2.6 2000/06/13 07:58:48 n_hibma Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index d2b85a9b9806..682acda043d4 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.32.2.6 2000/06/13 07:58:48 n_hibma Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index e572b3ebb71c..c2643157e9f0 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.c,v 1.60 2000/01/19 00:23:58 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.34.2.3 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 3fb7c4bb0aee..de0a235c05e7 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.39 2000/01/19 00:23:59 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.21.2.1 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 09b520305cca..241d6c7d8b3a 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi_util.c,v 1.24 1999/11/17 23:00:50 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.15.2.2 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index 14c52cec25a5..4390556b6f9b 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi_util.h,v 1.17 1999/09/05 19:32:19 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.9.2.1 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 9d8ca8aae575..799ff9913ae1 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdivar.h,v 1.46 2000/01/19 01:16:40 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.14.2.1 2000/07/02 11:44:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 0379b2132c59..d4e33a9ecab9 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.h,v 1.4 1999/04/22 01:57:01 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7.2.1 2000/07/02 11:44:00 n_hibma Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/vinum/COPYRIGHT b/sys/dev/vinum/COPYRIGHT
index f0295e6a6d0e..aafb761a30c0 100644
--- a/sys/dev/vinum/COPYRIGHT
+++ b/sys/dev/vinum/COPYRIGHT
@@ -33,5 +33,5 @@
  * 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/dev/vinum/COPYRIGHT,v 1.4 1999/08/28 00:42:36 peter Exp $
  */
diff --git a/sys/dev/vinum/makestatetext b/sys/dev/vinum/makestatetext
index c5a7da2ba211..fc736be4df7c 100755
--- a/sys/dev/vinum/makestatetext
+++ b/sys/dev/vinum/makestatetext
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Make statetexts.h from vinumstate.h
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/vinum/makestatetext,v 1.6 2000/02/29 06:07:01 grog Exp $
 # $Id: makestatetext,v 1.7 1999/12/29 07:24:54 grog Exp grog $
 infile=vinumstate.h
 ofile=statetexts.h
diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h
index 9f29297e021b..0d6a83f491d9 100644
--- a/sys/dev/vinum/request.h
+++ b/sys/dev/vinum/request.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: request.h,v 1.17 1999/12/27 02:18:05 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/request.h,v 1.17 2000/01/05 06:01:34 grog Exp $
  */
 
 /* Information needed to set up a transfer */
diff --git a/sys/dev/vinum/statetexts.h b/sys/dev/vinum/statetexts.h
index 88cfc17d0309..921c74363223 100644
--- a/sys/dev/vinum/statetexts.h
+++ b/sys/dev/vinum/statetexts.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/dev/vinum/statetexts.h,v 1.9 2000/02/29 06:07:01 grog Exp $
  */
 
 /* Drive state texts */
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 37f50a31b1a3..365b118d8ec8 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -36,7 +36,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinum.c,v 1.32 2000/05/10 07:54:29 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.38.2.1 2000/06/08 02:00:23 grog Exp $
  */
 
 #define STATIC static					    /* nothing while we're testing XXX */
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 06850c8865c9..a1fcc5747f78 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -46,7 +46,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumconfig.c,v 1.30 2000/05/01 09:45:50 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.32.2.2 2000/06/08 02:00:23 grog Exp $
  */
 
 #define STATIC static
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 835fec83a3ad..f63c8bf14f1d 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -35,7 +35,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumdaemon.c,v 1.8 2000/01/03 05:22:03 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumdaemon.c,v 1.16 2000/01/05 06:03:56 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index 9de124e2b9f2..b457fffb433f 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumext.h,v 1.25 2000/05/10 06:08:43 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.25.2.1 2000/05/11 08:49:22 grog Exp $
  */
 
 /* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 9fa4f58cc1b3..d0dc9a322148 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -37,7 +37,7 @@
 /* Header files used by all modules */
 /*
  * $Id: vinumhdr.h,v 1.15 1999/10/12 09:40:35 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.16 1999/12/29 04:35:48 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index fd3c2f32fb45..03f1dde74eb4 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -40,7 +40,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinuminterrupt.c,v 1.11 2000/05/10 22:32:51 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.25.2.1 2000/05/11 08:49:22 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index d2a77c236b10..b22a55f7519c 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumio.c,v 1.30 2000/05/10 23:23:30 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.52.2.2 2000/06/08 02:00:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index cca47b86d0f1..4c5b79e20442 100644
--- a/sys/dev/vinum/vinumio.h
+++ b/sys/dev/vinum/vinumio.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumio.h,v 1.19 2000/04/26 04:17:33 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.h,v 1.18.2.1 2000/05/11 08:49:22 grog Exp $
  */
 
 #define L 'F'						    /* ID letter of our ioctls */
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 309448a37a85..da4126c55b13 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -42,7 +42,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumioctl.c,v 1.12 2000/02/29 02:20:31 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.25.2.2 2000/06/08 02:00:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index b312bf033dd0..786f823c48cd 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumkw.h,v 1.16 2000/02/19 06:52:46 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumkw.h,v 1.18.2.1 2000/06/08 02:00:23 grog Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index 4ed968df13ea..76708506bc15 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumlock.c,v 1.13 2000/05/02 23:25:02 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.18.2.1 2000/05/11 08:49:22 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 147d92484521..3eb126b6f2a4 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinummemory.c,v 1.25 2000/05/04 01:57:48 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.22.2.1 2000/06/02 04:26:11 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index ce353bfeb7f7..26cedde098b3 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -34,7 +34,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumparser.c,v 1.20 2000/04/22 05:32:50 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumparser.c,v 1.20.2.3 2000/06/08 02:00:23 grog Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index dc189ef4d75b..ad41dcce2cab 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -39,7 +39,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumraid5.c,v 1.20 2000/05/10 22:31:38 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumraid5.c,v 1.6.2.1 2000/05/11 08:49:23 grog Exp $
  */
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 30539769d5b0..4093894f3efb 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumrequest.c,v 1.26 1999/12/30 07:38:33 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.44.2.2 2000/06/08 02:00:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 6e35b7acd4e3..e08565871791 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumrevive.c,v 1.10 2000/01/03 03:40:54 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.22.2.3 2000/06/08 02:00:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index b758f04b8c9e..d684fa8a3982 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumstate.c,v 2.18 2000/05/10 07:30:50 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumstate.c,v 1.28.2.2 2000/06/08 02:00:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index 572f317d03dc..beef6aae3b0b 100644
--- a/sys/dev/vinum/vinumstate.h
+++ b/sys/dev/vinum/vinumstate.h
@@ -33,7 +33,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/dev/vinum/vinumstate.h,v 1.9 1999/08/28 00:42:43 peter Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index 52c7d2774051..1222b6cd4043 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -36,7 +36,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumutil.c,v 1.14 1999/12/30 07:04:02 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.15 2000/02/29 06:16:44 grog Exp $
  */
 
 /* This file contains utility routines used both in kernel and user context */
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 6e4aff1c647c..30ac31e819a5 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumvar.h,v 1.25 2000/05/11 05:28:47 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.32.2.1 2000/05/11 08:49:23 grog Exp $
  */
 
 #include <sys/time.h>
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 73b2ee1662c0..d00c222c6775 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vn/vn.c,v 1.105.2.1 2000/05/15 16:50:33 dillon Exp $
  */
 
 /*
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index da8dcb0c81b2..b103380ce037 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR 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/dev/vx/if_vx.c,v 1.25.2.4 2000/07/17 21:24:28 archie Exp $
  *
  */
 
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 134c360ab05a..77d88c472553 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.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/dev/vx/if_vx_eisa.c,v 1.14 2000/01/29 14:50:31 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index c9f918d1342b..790007c2d1ca 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.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/dev/vx/if_vx_pci.c,v 1.20 2000/01/29 14:50:32 peter Exp $
  */
 
 #include "vx.h"
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index b0301953205e..728f65300a98 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.5 2000/07/21 22:38:24 imp Exp $
  */
 
 /*
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index cdb6a3a9616c..0453cd18e77c 100644
--- a/sys/dev/xe/if_xereg.h
+++ b/sys/dev/xe/if_xereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xereg.h,v 1.5 2000/01/10 08:05:53 imp Exp $
  */
 #ifndef DEV_XE_IF_XEREG_H
 #define DEV_XE_IF_XEREG_H
diff --git a/sys/dev/xe/if_xevar.h b/sys/dev/xe/if_xevar.h
index 150d25d46963..c36511924657 100644
--- a/sys/dev/xe/if_xevar.h
+++ b/sys/dev/xe/if_xevar.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xevar.h,v 1.1.2.1 2000/06/01 01:23:53 imp Exp $
  */
 #ifndef DEV_XE_IF_XEDEV_H
 #define DEV_XE_IF_XEDEV_H