release/5.4.0_cvs

author: cvs2svn <cvs2svn@FreeBSD.org> 2005-05-07 17:51:10 +0000
committer: cvs2svn <cvs2svn@FreeBSD.org> 2005-05-07 17:51:10 +0000
commit: e87a6b5d6805bf9f3f9faf53db0ba96345ef0f77 (patch)
tree: 5d7f179f3d81639a2b00e739c98d784b98e1bfae /sys/dev
parent: bbe327aea67f046183f949450d6271765b9ebfb0 (diff)
1293 files changed, 1319 insertions, 1319 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 937df7acae6ac..2fa055743c58e 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.101.2.5 2005/03/02 16:30:39 scottl Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 3755e58de7423..3b04095dfa997 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.17.2.2 2005/01/30 00:59:22 imp Exp $");
 
 /*
  * CAM front-end for communicating with non-DASD devices
diff --git a/sys/dev/aac/aac_compat.h b/sys/dev/aac/aac_compat.h
index ef61c0a365031..8897786c6e174 100644
--- a/sys/dev/aac/aac_compat.h
+++ b/sys/dev/aac/aac_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/aac/aac_compat.h,v 1.3 2001/09/05 20:43:02 scottl Exp $
  */
 /*
  * Backwards compatibility support.
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index 595874538cfb9..bca1ba7466b5d 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.19.2.1 2004/12/10 16:37:14 scottl Exp $");
 
 /*
  * Debugging support.
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 5543e56650aca..1c571c260696d 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.41.2.1 2004/12/10 16:37:13 scottl Exp $");
 
 #include "opt_aac.h"
 
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
index 21c944b057321..177cbbc8c6955 100644
--- a/sys/dev/aac/aac_linux.c
+++ b/sys/dev/aac/aac_linux.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.3 2004/05/30 20:08:23 phk Exp $");
 
 /*
  * Linux ioctl handler for the aac device driver
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 66ba9ab67259a..c1a210c09c097 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.48.2.4 2005/02/02 06:44:24 scottl Exp $");
 
 /*
  * PCI bus interface and resource allocation.
diff --git a/sys/dev/aac/aac_tables.h b/sys/dev/aac/aac_tables.h
index 47ebd0360764d..1155f4dfbe16f 100644
--- a/sys/dev/aac/aac_tables.h
+++ b/sys/dev/aac/aac_tables.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/aac/aac_tables.h,v 1.4 2001/12/04 02:39:06 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 9116beb3eba1d..17877091c4825 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.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/aac/aacreg.h,v 1.18.2.1 2005/01/23 16:16:51 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index 87e3c9c8ad75a..726511b772e4a 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.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/aac/aacvar.h,v 1.46 2004/08/13 01:44:09 scottl Exp $
  */
 
 #include <sys/bio.h>
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c
index df818cd6f644e..a8f330213f094 100644
--- a/sys/dev/acpica/Osd/OsdDebug.c
+++ b/sys/dev/acpica/Osd/OsdDebug.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/acpica/Osd/OsdDebug.c,v 1.8.2.1 2004/09/10 22:14:08 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c
index e8f933d5af23f..be811df9319da 100644
--- a/sys/dev/acpica/Osd/OsdHardware.c
+++ b/sys/dev/acpica/Osd/OsdHardware.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/acpica/Osd/OsdHardware.c,v 1.14 2004/06/18 17:56:45 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c
index 1066254f0b021..af6d82d01e872 100644
--- a/sys/dev/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpica/Osd/OsdInterrupt.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/acpica/Osd/OsdInterrupt.c,v 1.18.2.1 2004/12/19 04:17:49 marks Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c
index e32dc59aeb361..9fcb82c7ffe44 100644
--- a/sys/dev/acpica/Osd/OsdMemory.c
+++ b/sys/dev/acpica/Osd/OsdMemory.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/acpica/Osd/OsdMemory.c,v 1.11 2004/04/14 03:39:08 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 03cf92ac724c8..5507ce55af009 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.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/acpica/Osd/OsdSchedule.c,v 1.29.2.1.2.1 2005/04/22 23:31:31 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdStream.c b/sys/dev/acpica/Osd/OsdStream.c
index b4150cff6c7e8..1542c7ddb84a8 100644
--- a/sys/dev/acpica/Osd/OsdStream.c
+++ b/sys/dev/acpica/Osd/OsdStream.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/acpica/Osd/OsdStream.c,v 1.4 2004/04/14 03:39:08 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c
index 571afa4565020..11efde1ca2efa 100644
--- a/sys/dev/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpica/Osd/OsdSynch.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/acpica/Osd/OsdSynch.c,v 1.22 2004/06/18 17:58:11 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c
index 0ce25d2da560b..aa9c0a9dbae7f 100644
--- a/sys/dev/acpica/Osd/OsdTable.c
+++ b/sys/dev/acpica/Osd/OsdTable.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/acpica/Osd/OsdTable.c,v 1.7.2.1 2004/10/08 18:09:36 njl Exp $
  */
 
 /*
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 3d69ffa5751a7..d5f06c1352a71 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.186.2.12 2005/03/02 09:26:43 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 0b9bac35c579b..d2410fd8be269 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.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/acpica/acpi_acad.c,v 1.31.2.1 2004/12/19 04:17:49 marks Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c
index d2adad987d84d..e8a235ffae0c5 100644
--- a/sys/dev/acpica/acpi_battery.c
+++ b/sys/dev/acpica/acpi_battery.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.10.2.1 2005/03/02 09:26:43 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index 3ca4add3616f0..56b87d537ff1a 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.29.2.1 2005/03/02 09:26:43 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 54e4982250607..a0a8b441797b3 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.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/acpica/acpi_cmbat.c,v 1.36.2.3 2004/12/27 05:45:38 njl Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 30ba2e9a340de..db183d2a24936 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.42.2.3 2005/02/25 21:43:37 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index ae318c33cd758..d3be52f4d2739 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -136,7 +136,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.59.2.2 2005/02/25 21:43:37 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_if.m b/sys/dev/acpica/acpi_if.m
index 9c63b3e49fb1d..48fd2c5682e8f 100644
--- a/sys/dev/acpica/acpi_if.m
+++ b/sys/dev/acpica/acpi_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/acpica/acpi_if.m,v 1.2.2.1 2005/01/29 19:52:39 njl Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c
index d61d6e7ad3bec..23b5ea16dfe9e 100644
--- a/sys/dev/acpica/acpi_isab.c
+++ b/sys/dev/acpica/acpi_isab.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.9 2004/06/29 19:02:27 njl Exp $");
 
 /*
  * ISA Bridge driver for Generic ISA Bus Devices.  See section 10.7 of the
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index 50421c64b95b9..fd1fe3ccc0e65 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.26.2.1 2004/08/29 23:24:33 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c
index 0cad9a01fa9c2..e3a165e9d748a 100644
--- a/sys/dev/acpica/acpi_package.c
+++ b/sys/dev/acpica/acpi_package.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/acpica/acpi_package.c,v 1.3.2.1 2005/02/25 21:43:38 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index c935ae8ffd451..bf108aad2dea7 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.23.2.3 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 555894663574b..fd396ccc6d4b8 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.24.2.6 2004/11/07 20:24:05 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 0a41ddc012530..023e5fea61635 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.50.2.1 2004/11/17 07:30:34 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index b386f08311280..5b5aaa57bd1d2 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.39.2.6 2005/03/02 09:28:29 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c
index 7debb581782af..73e093d4f91e1 100644
--- a/sys/dev/acpica/acpi_pcib_pci.c
+++ b/sys/dev/acpica/acpi_pcib_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.10.2.1 2005/03/02 09:14:59 obrien Exp $");
 
 #include "opt_acpi.h"
 
diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h
index 2c59fae66d0b1..f751e62c4680e 100644
--- a/sys/dev/acpica/acpi_pcibvar.h
+++ b/sys/dev/acpica/acpi_pcibvar.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/acpica/acpi_pcibvar.h,v 1.3 2004/08/11 14:52:50 njl Exp $
  */
 
 #ifndef	_ACPI_PCIBVAR_H_
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index 1a37216463ce0..9d09402f59836 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.26.2.2 2005/02/25 21:43:38 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_quirk.c b/sys/dev/acpica/acpi_quirk.c
index f50bee398be82..151aa620b4369 100644
--- a/sys/dev/acpica/acpi_quirk.c
+++ b/sys/dev/acpica/acpi_quirk.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/acpica/acpi_quirk.c,v 1.1 2004/06/30 04:45:32 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_quirks b/sys/dev/acpica/acpi_quirks
index 055f3a97d6eee..a60c495c01ecc 100644
--- a/sys/dev/acpica/acpi_quirks
+++ b/sys/dev/acpica/acpi_quirks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/acpica/acpi_quirks,v 1.3.2.2 2005/02/27 21:30:31 obrien Exp $
 #
 # Quirks for ACPI tables can be added here.
 #
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index e8c13fb9531fc..208e355298d1d 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.28.2.2 2005/02/04 22:07:18 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 53e791f6407c8..8ccb2b14eaa80 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.48.2.4 2005/02/25 21:43:38 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c
index b736124db61e1..e811f10a442c7 100644
--- a/sys/dev/acpica/acpi_throttle.c
+++ b/sys/dev/acpica/acpi_throttle.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.5.2.1 2005/02/25 21:43:38 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index 446a7b7e08d2e..448cc56828011 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.35.2.3 2005/03/02 09:26:43 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index f2a5ce0b0b810..077f023a70d89 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.8.2.2 2005/03/02 09:26:43 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/acpiio.h b/sys/dev/acpica/acpiio.h
index d4221ab3310f3..3d854cb8c0780 100644
--- a/sys/dev/acpica/acpiio.h
+++ b/sys/dev/acpica/acpiio.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/acpica/acpiio.h,v 1.10.2.2 2005/03/02 09:18:41 obrien Exp $
  */
 
 #ifndef _ACPIIO_H_
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 2552b382dfc82..ae03268c9c4da 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.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/acpica/acpivar.h,v 1.79.2.7.2.1 2005/04/22 23:31:31 njl Exp $
  */
 
 #ifndef _ACPIVAR_H_
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c
index dc86c89aea776..96a09d8b56b02 100644
--- a/sys/dev/adlink/adlink.c
+++ b/sys/dev/adlink/adlink.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.11.2.1 2005/01/30 00:59:23 imp Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index e56cf29653f0c..eb77032aca7bc 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.16.2.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 8a3a0790843b6..3d9bf46d30c33 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.26.2.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index aa97f1ba07123..b0cbd3673bd3b 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.24.2.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 7b9cfb1e3fb84..6423331d93a56 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.27.4.1 2005/01/30 00:59:23 imp Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index a8c5604728605..f34b55f298380 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.3.8.1 2005/01/30 00:59:23 imp Exp $
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 4604571da52fa..fd68ff0f98381 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advlib.c,v 1.21.4.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index f7a3acb633b58..198af36fe462d 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.11.8.1 2005/01/30 00:59:23 imp Exp $
  */
 /*-
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index d5e7bba9634a3..11c3304bdc1c3 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advmcode.c,v 1.8.4.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index 60b4e03cdb1ad..a6854e84028e0 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.7.2.1 2005/01/30 00:59:23 imp Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 1f88d772a79e9..608e6ca4b143f 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.20.2.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index c6c14fd99cc08..e4ba0d2c39d89 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.18.4.2 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index 518d76bc367d0..177868ef00c04 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.9.4.2 2005/03/02 09:39:24 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index a1d72ec7c383d..f679c0f0220a2 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.7.8.1 2005/01/30 00:59:23 imp Exp $
  */
 /*-
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index a43720c423dd7..eb83bf5848cf8 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwmcode.c,v 1.4.4.1 2005/01/30 00:59:23 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index e3ab3f47a0ec9..98b3fd2f927ae 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.26.1 2005/01/30 00:59:23 imp Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index 0510ab0185c38..ac84435166690 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.4.8.1 2005/01/30 00:59:23 imp Exp $
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index c6025420c2dfe..980fe7e72e1ae 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha.c,v 1.55.4.1 2005/01/30 00:59:24 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index c657619e9cce9..0fea6838a40cb 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.29.2.2 2005/03/02 09:38:19 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c
index 730e57e794297..163d803665c6c 100644
--- a/sys/dev/aha/aha_mca.c
+++ b/sys/dev/aha/aha_mca.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.11 2004/03/17 17:50:24 njl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index a248caab08da2..99f543b9550d1 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.17.4.2 2005/03/02 09:35:22 obrien Exp $
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 4d7249c5aaa6a..0051a00ec292d 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.32.2.1 2005/01/30 00:59:24 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index d4544434eadbf..700d2c1a52633 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.4.8.1 2005/01/30 00:59:24 imp Exp $
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 31f4283cb2bc5..b5dea35c782fd 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic.c,v 1.22 2003/08/24 17:48:02 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index 53962aed9d35b..367154f309d27 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.3.8.1 2005/01/30 00:59:24 imp Exp $
  */
 
 #define SCSISEQ		0x00	/* SCSI sequence control */
diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c
index d95f648ce3648..0d286ed773039 100644
--- a/sys/dev/aic/aic_cbus.c
+++ b/sys/dev/aic/aic_cbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.10 2004/03/17 17:50:25 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index 0fd2125d07a62..ef8dbeb4d8996 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.11 2004/03/17 17:50:25 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 55831508a9664..70eb4dccf9d7e 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.14 2004/05/27 03:49:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index d834fb64dda44..f10815a475ace 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.8 2002/03/20 02:02:34 alfred Exp $
  */
 
 struct aic_transinfo {
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index f98059f69016d..5454818d4bc57 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.34.2.1 2005/01/30 00:59:24 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index d01ffc96d3f85..ab557b70bd96b 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.1.2.4 2005/01/30 00:59:25 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index a9d4478420af5..143b70541559f 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.62.2.1 2005/01/30 00:59:25 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 01439442b7cfa..4246fb3d628b0 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.16.2.1 2005/01/30 00:59:25 imp Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 
diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c
index 1ce48f9b8df94..1882f9e8395fa 100644
--- a/sys/dev/aic7xxx/aic7770.c
+++ b/sys/dev/aic7xxx/aic7770.c
@@ -46,7 +46,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.17.2.1 2005/01/30 00:59:25 imp Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index 0cd1a7950574d..36949dbcf4446 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -46,7 +46,7 @@
 #include "aicasm/aicasm_insformat.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.31.2.4 2005/02/16 23:38:34 gibbs Exp $");
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index c8de9b776dfe4..1bd3d5d72613b 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/aic7xxx/aic79xx.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.21.2.3 2005/02/16 23:38:34 gibbs Exp $
  */
 
 #ifndef _AIC79XX_H_
diff --git a/sys/dev/aic7xxx/aic79xx.reg b/sys/dev/aic7xxx/aic79xx.reg
index e856b6236eae8..7d99ee4d9ac49 100644
--- a/sys/dev/aic7xxx/aic79xx.reg
+++ b/sys/dev/aic7xxx/aic79xx.reg
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.18.2.1 2005/01/30 00:59:25 imp Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $"
 
diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index d8d4f921380ce..db9997a8e9ed3 100644
--- a/sys/dev/aic7xxx/aic79xx.seq
+++ b/sys/dev/aic7xxx/aic79xx.seq
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.17.2.1 2005/01/30 00:59:25 imp Exp $
  */
 
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $"
diff --git a/sys/dev/aic7xxx/aic79xx_inline.h b/sys/dev/aic7xxx/aic79xx_inline.h
index 064a5e8ddd7f3..50663bc376160 100644
--- a/sys/dev/aic7xxx/aic79xx_inline.h
+++ b/sys/dev/aic7xxx/aic79xx_inline.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#57 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_inline.h,v 1.16.2.1 2005/01/30 00:59:25 imp Exp $
  */
 
 #ifndef _AIC79XX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index 1971c0b6eb7cd..5d66362f98ea3 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.19.2.2 2005/02/16 17:43:26 gibbs Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index c6f36f1d87000..79b6e68f0c508 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -32,7 +32,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#23 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.14.2.1 2005/01/30 00:59:25 imp Exp $
  */
 
 #ifndef _AIC79XX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index d59f1155feb29..35d01385277ea 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -46,7 +46,7 @@
 #include "aic79xx_inline.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.20.2.3 2005/02/16 23:38:34 gibbs Exp $");
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #endif
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index a42cff644085d..d5f1dd22f6f8e 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -46,7 +46,7 @@
 #include "aicasm/aicasm_insformat.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.102.2.3 2005/02/16 23:38:34 gibbs Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 0ac10be927522..16cdebd75b1d7 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.51.2.3 2005/02/16 23:38:34 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 076c2ba49f926..e837a96618008 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.46.2.1 2005/01/30 00:59:25 imp Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 0eefaaa41b791..d328f4c2c4182 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.127.2.1 2005/01/30 00:59:25 imp Exp $
  */
 
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $"
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c
index ab63f181901b4..8833a1a16cc3c 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.c
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c
@@ -70,7 +70,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.c,v 1.19.2.1 2005/01/30 00:59:25 imp Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 3827015edcbb8..5cb379f1be911 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.h#12 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.h,v 1.11.8.1 2005/01/30 00:59:25 imp Exp $
  */
 #ifndef _AIC7XXX_93CX6_H_
 #define _AIC7XXX_93CX6_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h
index 989ac79dfc249..46804385ac077 100644
--- a/sys/dev/aic7xxx/aic7xxx_inline.h
+++ b/sys/dev/aic7xxx/aic7xxx_inline.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#47 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_inline.h,v 1.23.2.1 2005/01/30 00:59:25 imp Exp $
  */
 
 #ifndef _AIC7XXX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index a1b65bb860f32..b79d3bb4cfad6 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.41.2.1 2005/01/30 00:59:26 imp Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index 07752a3b5bc44..9957600da690e 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -31,7 +31,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.h#18 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.27.2.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #ifndef _AIC7XXX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c
index d37607daadd58..0654afadcfb03 100644
--- a/sys/dev/aic7xxx/aic7xxx_pci.c
+++ b/sys/dev/aic7xxx/aic7xxx_pci.c
@@ -48,7 +48,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.32.2.2 2005/01/30 00:59:26 imp Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic_osm_lib.c b/sys/dev/aic7xxx/aic_osm_lib.c
index 8919789c6db06..c6a42515b938b 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.c
+++ b/sys/dev/aic7xxx/aic_osm_lib.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.c,v 1.3.2.1 2005/01/30 00:59:26 imp Exp $");
 
 static void	aic_recovery_thread(void *arg);
 
diff --git a/sys/dev/aic7xxx/aic_osm_lib.h b/sys/dev/aic7xxx/aic_osm_lib.h
index 1c8678b58bf70..0ce11e4ede3a9 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.h
+++ b/sys/dev/aic7xxx/aic_osm_lib.h
@@ -32,7 +32,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic_osm_lib.h#5 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.h,v 1.3.2.2 2005/02/16 23:38:34 gibbs Exp $
  */
 
 /******************************** OS Includes *********************************/
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index 41499b2a86feb..ce2cff7ea2791 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -1,7 +1,7 @@
 #
 # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.18.2.1 2005/02/13 07:23:32 obrien Exp $
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index ad010649c8b55..7e5eb77000cce 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.37.2.1 2005/01/30 00:59:26 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 440cb495f9552..50615710e1d3c 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#14 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.16.8.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index f96116d0f9cbd..6a2997c93b389 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#29 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y,v 1.23.6.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
index 820310b469cd7..f906583c05723 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#11 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h,v 1.8.8.1 2005/01/30 00:59:26 imp Exp $
  */
 
 struct ins_format1 {
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
index 48551c6b0f84c..56637f8a77906 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_gram.y#5 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y,v 1.2.8.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
index 49557a8837f84..76fafb7c75326 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#8 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l,v 1.5.2.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index ced09dc2b12b6..98248533034ed 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l,v 1.22.2.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index 9770a71b8d091..f419e4fe0bd9c 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.c#24 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.23.6.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index 1496c3768c815..14e926cfa16b1 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.h#17 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.16.8.1 2005/01/30 00:59:26 imp Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index 0c9f28979f360..49b966bc299b6 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -30,7 +30,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/amd/amd.c,v 1.27.2.1 2005/01/30 00:59:27 imp Exp $
  */
 
 /*
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index d9b8cd209b342..15a36e58a1085 100644
--- a/sys/dev/amd/amd.h
+++ b/sys/dev/amd/amd.h
@@ -30,7 +30,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/amd/amd.h,v 1.5.6.1 2005/01/30 00:59:27 imp Exp $
  */
 
 #ifndef AMD_H
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 4fe9ba7aadc5f..5d4c4e4fc5124 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.54.2.4 2005/03/15 03:57:52 scottl Exp $");
 
 /*
  * Driver for the AMI MegaRaid family of controllers.
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index ba9b59062d5e0..20a2d74f703f7 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.9.4.3.2.1 2005/05/06 00:54:02 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_compat.h b/sys/dev/amr/amr_compat.h
index 33a09f0eebbe4..b5ecd8c189baf 100644
--- a/sys/dev/amr/amr_compat.h
+++ b/sys/dev/amr/amr_compat.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/amr/amr_compat.h,v 1.6 2003/03/08 08:01:27 phk Exp $
  */
 /*
  * Backwards compatibility support.
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 047ada0fbe7f0..e46f339f8eda3 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.33.2.2 2005/03/04 18:06:18 scottl Exp $");
 
 /*
  * Disk driver for AMI MegaRaid controllers
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index c70159babfd78..9c936934677c1 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.23.2.3 2005/03/04 18:06:18 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_tables.h b/sys/dev/amr/amr_tables.h
index b1a4e441af426..914438ee9daf9 100644
--- a/sys/dev/amr/amr_tables.h
+++ b/sys/dev/amr/amr_tables.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/amr/amr_tables.h,v 1.3 2002/10/30 22:00:11 emoore Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index e14ade467cd0b..fca855ff13bcd 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.h
@@ -52,7 +52,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/amr/amrio.h,v 1.6 2004/08/16 17:23:09 ambrisko Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index f08b113b7343e..0d38b654ce075 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.7.8.1 2005/03/04 18:06:18 scottl Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 3af12a35063ec..a2c678ba5bc5e 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.22.2.2 2005/03/04 18:06:18 scottl Exp $
  */
 
 #if __FreeBSD_version >= 500005
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index 28e4f72148e96..3ad6145edb9e0 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.14.2.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #ifndef _IF_AIRONET_IEEE_H
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 29b0adb571c87..24b32cfc1d3e0 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.63.2.1 2005/01/30 00:59:28 imp Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 7144cc8778add..cb43afd66b383 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.14.2.1 2005/01/30 00:59:28 imp Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index ad37b67de5a2a..5d5fac53e36f1 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.26.2.1 2005/01/30 00:59:28 imp Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 67d27a3288627..a519025092ead 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.26 2003/12/30 01:07:12 ambrisko Exp $");
 
 /*
  * This is a PCI shim for the Aironet PC4500/4800 wireless network
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index 12a03f004adee..af141b069e7ee 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.21.2.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #define AN_TIMEOUT	65536
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 70abc1d04b0ca..a5300a189ccec 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.65.2.1 2005/01/30 00:59:28 imp Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar.h b/sys/dev/ar/if_ar.h
index a6fc8cf088ec1..8b709a40aa792 100644
--- a/sys/dev/ar/if_ar.h
+++ b/sys/dev/ar/if_ar.h
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ar/if_ar.h,v 1.3.10.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #ifndef _I386_ISA_IF_AR_H_
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 81c001f35e8a6..9f04f6a3ea9de 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.53.4.1 2005/01/30 00:59:28 imp Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index 0815d5e8f7d95..651cc8487d7fd 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.11 2004/05/30 20:08:26 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index d643cafee44cc..6777f6b148e10 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.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/ar/if_arregs.h,v 1.9.6.1 2005/01/30 00:59:28 imp Exp $
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index dffe02e60b7dd..87b9c5081412f 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -40,7 +40,7 @@
 **     1.00.00.00    3/31/2004	       Erich Chen	     First release
 **     1.20.00.02   11/29/2004         Erich Chen        bug fix with arcmsr_bus_reset when PHY error
 ******************************************************************************************
-** $FreeBSD$
+** $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.2.2.1.2.1 2005/04/30 15:58:47 scottl Exp $
 */
 #define ARCMSR_DEBUG            1
 /*
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index b94b33078b5c1..d0c2bd89f2cd8 100644
--- a/sys/dev/arcmsr/arcmsr.h
+++ b/sys/dev/arcmsr/arcmsr.h
@@ -30,7 +30,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/arcmsr/arcmsr.h,v 1.1.2.1 2005/04/02 16:14:53 scottl Exp $
 */
 #define ARCMSR_DRIVER_VERSION                        "Driver Version 1.20.00.02"
 #define ARCMSR_SCSI_INITIATOR_ID                                               16
diff --git a/sys/dev/arl/if_arl.c b/sys/dev/arl/if_arl.c
index 2d199e46286b3..2bc918d708b34 100644
--- a/sys/dev/arl/if_arl.c
+++ b/sys/dev/arl/if_arl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.9 2004/08/13 22:54:19 rwatson Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arl_isa.c b/sys/dev/arl/if_arl_isa.c
index 62ad3bd0d67c3..2da446f75eea3 100644
--- a/sys/dev/arl/if_arl_isa.c
+++ b/sys/dev/arl/if_arl_isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl_isa.c,v 1.4 2004/07/31 20:47:57 fjoe Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arlreg.h b/sys/dev/arl/if_arlreg.h
index 137232f29de03..40b0be3bf9b7d 100644
--- a/sys/dev/arl/if_arlreg.h
+++ b/sys/dev/arl/if_arlreg.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.5 2004/07/31 20:47:57 fjoe Exp $
  */
 
 #ifndef _IF_ARLREG_H
diff --git a/sys/dev/asr/MAINTAINER b/sys/dev/asr/MAINTAINER
index 337f8fb3d5f08..2dc16cf0f2a04 100644
--- a/sys/dev/asr/MAINTAINER
+++ b/sys/dev/asr/MAINTAINER
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/asr/MAINTAINER,v 1.3 2001/12/13 23:48:34 obrien Exp $
 MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index aff8fc11db5eb..b3ba5c23ff631 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -164,7 +164,7 @@
 
 #include	"dev/asr/sys_info.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.64.2.1.2.1 2005/04/30 15:53:24 scottl Exp $");
 
 #define	ASR_VERSION	1
 #define	ASR_REVISION	'1'
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index 038dc6f4b5bb0..67ad81780774f 100644
--- a/sys/dev/asr/dptalign.h
+++ b/sys/dev/asr/dptalign.h
@@ -20,7 +20,7 @@
  *
  * DPT Alignment Description File
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/dptalign.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  */
 #if (!defined(__DPTALIGN_H))
 #define	      __DPTALIGN_H
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index a70ad114bdc39..a108a78f88010 100644
--- a/sys/dev/asr/dptsig.h
+++ b/sys/dev/asr/dptsig.h
@@ -19,7 +19,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/dptsig.h,v 1.7.8.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #ifndef __DPTSIG_H_
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index c189d8d658d99..7a196ac265fb7 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2oadptr.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index a6666feb661bb..4b7e12169a325 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2obscsi.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index c1e6e5067ce2a..a7848f7bfde69 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -46,7 +46,7 @@
  * become a "Registered Developer" of the I2O SIG. This can be done by calling
  * 415-750-8352 in the US, or via http://www.i2osig.org.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odep.h,v 1.7.8.1 2005/01/30 00:59:28 imp Exp $
  *
  **************************************************************************/
 
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 4c9a9d4623187..6da3d2388e458 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2000 Adaptec Corporation.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odpt.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index ae4327a6cb801..fc909ce59c6fd 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2oexec.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index 833bd9173d387..97025d2b3cde0 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2omsg.h,v 1.6.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index c85d92dd2c327..e69cc882d8c97 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2otypes.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index c7e3061dbb282..282eec6c4f995 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2outil.h,v 1.5.8.1 2005/01/30 00:59:28 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index c954be9816b17..133a883aaf969 100644
--- a/sys/dev/asr/osd_defs.h
+++ b/sys/dev/asr/osd_defs.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_defs.h,v 1.6.8.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #ifndef		_OSD_DEFS_H
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index 04f7a29b6969f..45aee6b7a9fb7 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_unix.h,v 1.8.8.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #ifndef		__OSD_UNIX_H
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index baa233804a3f6..ed9460c2d5073 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_util.h,v 1.9.6.1 2005/01/30 00:59:28 imp Exp $
  */
 
 #ifndef		__OSD_UTIL_H
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index b4c78fe819fd1..95a7e9ea93d39 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/sys_info.h,v 1.8.8.1 2005/01/30 00:59:29 imp Exp $
  */
 
 #ifndef		__SYS_INFO_H
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 4445fda418351..bad38fad098a9 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.222.2.10.2.1 2005/04/07 14:26:34 kensmith Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index d7552a1e35b15..d18a50ef4c587 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.81.2.4 2005/03/01 19:37:41 gad Exp $
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index 0a6c8c64f9690..1e952ef8f5eec 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.25.2.4 2005/02/02 22:51:17 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/ata-cbus.c b/sys/dev/ata/ata-cbus.c
index 925b30f04fbcc..02149296e6033 100644
--- a/sys/dev/ata/ata-cbus.c
+++ b/sys/dev/ata/ata-cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.13.2.1 2004/10/10 15:01:47 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index 1e1735f63bd20..a0dce8d5e4d11 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.81.2.6 2005/03/23 05:14:11 mdodd Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-commands.h b/sys/dev/ata/ata-commands.h
index ea27d683325f2..dd6171372c344 100644
--- a/sys/dev/ata/ata-commands.h
+++ b/sys/dev/ata/ata-commands.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-commands.h,v 1.2 2004/04/30 16:21:34 sos Exp $
  */
 
 /* ATA commands */
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 9e49f862764ef..7ca04dd783ed7 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.175.2.3 2005/03/01 19:37:41 gad Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index c24c4ae4fca8b..ad06b20eef0e7 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.49 2004/04/30 16:21:34 sos Exp $
  */
 
 /* structure describing an ATA disk */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 974fb7d2ea7c7..030119aaab85c 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.129.2.3 2004/11/21 04:05:52 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c
index 4fadd2dc5349b..10189e12e0f61 100644
--- a/sys/dev/ata/ata-isa.c
+++ b/sys/dev/ata/ata-isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.22.2.1 2004/10/10 15:01:47 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c
index aec3b051d1306..cecde490283fb 100644
--- a/sys/dev/ata/ata-lowlevel.c
+++ b/sys/dev/ata/ata-lowlevel.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.44.2.5 2005/03/24 18:44:27 mdodd Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 747ba419ca35a..bfae92e71e744 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.87.2.4 2005/03/23 04:40:10 mdodd Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 5189e700a9ba2..37d90e4042d72 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.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-pci.h,v 1.32.2.4 2005/03/23 05:14:11 mdodd Exp $
  */
 
 /* structure holding chipset config info */
diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c
index d13d6e8f22d96..629fb546ca062 100644
--- a/sys/dev/ata/ata-queue.c
+++ b/sys/dev/ata/ata-queue.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.32.2.6.2.1 2005/04/08 03:27:11 mdodd Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index 4edaa7960af7c..891f7c5edde11 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.81 2004/08/09 14:22:58 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-raid.h b/sys/dev/ata/ata-raid.h
index 7a3e7a998d588..47d6634050942 100644
--- a/sys/dev/ata/ata-raid.h
+++ b/sys/dev/ata/ata-raid.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-raid.h,v 1.27 2004/06/25 21:21:59 sos Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index a0cd71cfca7f8..87d4e6dc777cd 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.35 2004/06/17 07:29:56 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 9b86948c4ffc4..ce15fa39a75be 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.170.2.2 2005/02/28 13:59:02 phk Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index 1618df513fbcb..d539ddef670ae 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.43 2004/04/30 16:21:34 sos Exp $
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 9fda1406aa563..b1b43b8562adc 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.97 2004/08/05 21:11:33 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h
index 4f37b0dea5d1a..de9f7607e454e 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.23 2004/04/30 16:21:34 sos Exp $
  */
 
 /* ATAPI Rewriteable drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 827edec19c114..d74c5cd64555b 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.93.2.1 2005/03/23 04:47:18 mdodd Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h
index f34328d255fad..6a34083b04f6d 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.22 2004/06/16 09:46:37 phk Exp $
  */
 
 /* ATAPI tape drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 89fa1459f681b..21bf081fb9f09 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.57.2.1 2005/01/30 00:59:29 imp Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index ae03834ed03ad..cab5b695504be 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.8.2.2 2005/02/07 18:01:28 sam Exp $");
 
 /*
  * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
diff --git a/sys/dev/ath/if_athioctl.h b/sys/dev/ath/if_athioctl.h
index 9d562561e2d77..b0d2c74fe249b 100644
--- a/sys/dev/ath/if_athioctl.h
+++ b/sys/dev/ath/if_athioctl.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.7.2.1 2005/01/30 00:59:29 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index c4e2b0344dfc6..a230f129698fa 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.14.2.1 2005/01/30 00:59:29 imp Exp $
  */
 
 /*
diff --git a/sys/dev/auxio/auxio.c b/sys/dev/auxio/auxio.c
index ebd0e254b18ee..e2ccdf10199c2 100644
--- a/sys/dev/auxio/auxio.c
+++ b/sys/dev/auxio/auxio.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.1.2.2 2005/01/30 00:59:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/auxio/auxioreg.h b/sys/dev/auxio/auxioreg.h
index 0c9ce8e9fa933..2657ece43f872 100644
--- a/sys/dev/auxio/auxioreg.h
+++ b/sys/dev/auxio/auxioreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/auxio/auxioreg.h,v 1.1.2.2 2005/01/30 00:59:29 imp Exp $ */
 /*	$NetBSD: auxioreg.h,v 1.4 2001/10/22 07:31:41 mrg Exp $	*/
 
 /*-
diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c
index 90f85c0b1acf6..c5f4c672f6bc2 100644
--- a/sys/dev/awi/am79c930.c
+++ b/sys/dev/awi/am79c930.c
@@ -65,7 +65,7 @@
 __KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.9 2004/01/15 09:33:48 onoe Exp $");
 #endif
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/am79c930.c,v 1.6 2004/01/15 10:04:20 onoe Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/awi/am79c930reg.h b/sys/dev/awi/am79c930reg.h
index 74d38bf38b37d..c31b4c75e127e 100644
--- a/sys/dev/awi/am79c930reg.h
+++ b/sys/dev/awi/am79c930reg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: am79c930reg.h,v 1.4 2003/11/02 11:07:45 wiz Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/am79c930reg.h,v 1.2 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/am79c930var.h b/sys/dev/awi/am79c930var.h
index 3836521f1e290..64e6964bfb9bb 100644
--- a/sys/dev/awi/am79c930var.h
+++ b/sys/dev/awi/am79c930var.h
@@ -1,5 +1,5 @@
 /* $NetBSD: am79c930var.h,v 1.3 2004/01/15 09:33:48 onoe Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/am79c930var.h,v 1.3 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 105b7a75d1628..de54fe2cc64f2 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -89,7 +89,7 @@
 __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $");
 #endif
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.34 2004/08/13 22:55:25 rwatson Exp $");
 #endif
 
 #include "opt_inet.h"
diff --git a/sys/dev/awi/awireg.h b/sys/dev/awi/awireg.h
index 555e058b3d146..133505be439af 100644
--- a/sys/dev/awi/awireg.h
+++ b/sys/dev/awi/awireg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: awireg.h,v 1.8 2003/01/20 05:30:06 simonb Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/awireg.h,v 1.2 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index b9f24e40773ea..8bba436cf6276 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -1,5 +1,5 @@
 /* $NetBSD: awivar.h,v 1.20 2004/01/15 09:39:15 onoe Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.10 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c
index 1f00ff7a51a1d..8e8b13f74853b 100644
--- a/sys/dev/awi/if_awi_pccard.c
+++ b/sys/dev/awi/if_awi_pccard.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.19.2.1 2005/01/30 00:59:30 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index 0b80abd39d9b8..75e2968fe0226 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -26,7 +26,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.15.2.5 2005/03/30 01:50:44 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index 4228650eeb9c1..b7d26867f522f 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bfe/if_bfereg.h,v 1.3.2.2 2005/01/30 00:59:30 imp Exp $ */
 
 #ifndef _BFE_H
 #define _BFE_H
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 35739bc2a3195..395ef54fa1d37 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.72.2.10.2.1 2005/05/06 00:38:51 dwhite Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index ac12570a1635c..3f211e28fa137 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -30,7 +30,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/bge/if_bgereg.h,v 1.28.2.5 2005/03/22 14:10:46 avatar Exp $
  */
 
 /*
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index 230ceb9f50fba..e81e3d8d3aef8 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.19 2002/05/16 22:43:18 eric Exp $ */
 /*
  * MAINTAINER = Roger Hardiman <roger@freebsd.org>
  */
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 7c6965d6a08d2..ef3368af200b2 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.13.2.1 2005/03/02 10:27:35 obrien Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index c05e40c31ea3f..2beec79ac18e8 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.3.4.1 2005/01/30 00:59:30 imp 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_card.c b/sys/dev/bktr/bktr_card.c
index 0dbc633d0cc99..d9d45233ff420 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.24.2.2 2005/03/02 10:27:35 obrien 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 77ccaf44ab0a0..624436c3a5c27 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.7.2.3 2005/03/02 10:27:35 obrien 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 5daca971a0319..8344644d9ed8c 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.135.2.3 2005/03/02 10:27:35 obrien 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 980ced76621a3..f972b61c9f9e4 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.6.2.1 2005/01/30 00:59:30 imp 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 807144d6fe1f1..de6a5ba586a5c 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.25.2.1 2005/03/02 10:27:35 obrien Exp $");
 
 /*
  * I2C support for the bti2c chipset.
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index a8333519ae91d..01243d1f1608e 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.4 2002/03/23 15:47:08 nsouch Exp $
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c
index 77c5971bacd46..ea9a71e57bc12 100644
--- a/sys/dev/bktr/bktr_mem.c
+++ b/sys/dev/bktr/bktr_mem.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.11.2.2 2005/03/02 10:27:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/bktr/bktr_mem.h b/sys/dev/bktr/bktr_mem.h
index 8feb55206c11d..17d0351f5a77c 100644
--- a/sys/dev/bktr/bktr_mem.h
+++ b/sys/dev/bktr/bktr_mem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_mem.h,v 1.1.10.1 2005/01/30 00:59:30 imp Exp $ */
 
 /*
  * This is prt of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index aed1942765d75..1ca7cfff5e4b4 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.47.2.1 2005/03/02 10:27:35 obrien 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 1cd708df3c6ad..f6e3792bb73c5 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.7.4.1 2005/01/30 00:59:30 imp 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 db1341cd369ec..8ea98f4adfd05 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.47.2.2 2005/03/02 10:27:35 obrien 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 a9b42ad76b4b7..450169e92a049 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.13.2.2 2005/03/02 10:27:35 obrien 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 1d6986b7974af..805a176019ed2 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.28.3 2005/03/02 10:27:35 obrien Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index 3731e7d2b34bd..fca5decc36038 100644
--- a/sys/dev/bktr/ioctl_bt848.h
+++ b/sys/dev/bktr/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/ioctl_bt848.h,v 1.30 2003/12/20 17:12:25 obrien Exp $
  */
 
 #ifndef  _DEV_BKTR_IOCTL_BT848_H_
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index 681990aa03c0d..b3fae4200cea6 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.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/bktr/ioctl_meteor.h,v 1.15.2.1 2005/01/30 00:59:31 imp Exp $
  */
 /*
  *	ioctl constants for Matrox Meteor Capture card.
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c
index 940205ac4af8e..4c87757598031 100644
--- a/sys/dev/bktr/msp34xx.c
+++ b/sys/dev/bktr/msp34xx.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/msp34xx.c,v 1.3.2.2 2005/03/02 10:12:18 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 74ad13b818759..eb5d953f2deac 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt.c,v 1.43.4.1 2005/01/30 00:59:31 imp Exp $");
 
  /*
   * Special thanks to Leonard N. Zubkoff for writing such a complete and
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index b1c40107aa78b..6b7a68393ca4f 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.19.2.1 2005/01/30 00:59:31 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 78f4b2e1133bb..c265e5ac04cc8 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_isa.c,v 1.23.2.1 2005/01/30 00:59:31 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c
index 1bdfbe8a6f826..c27d7a62c3168 100644
--- a/sys/dev/buslogic/bt_mca.c
+++ b/sys/dev/buslogic/bt_mca.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.9 2004/03/17 17:50:29 njl Exp $");
 
 /*
  * Written using the bt_isa/bt_pci code as a reference.
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index fe9d3f02ba1de..38c4a6cf8f774 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.19 2004/05/30 20:08:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index be6e74f90ebe8..08a6742f4dceb 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.15.8.1 2005/01/30 00:59:31 imp Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index cf65decab427d..3c5d6b3625e25 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.44.2.1 2005/01/30 00:59:31 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 45cddf721c13e..fb14e7cd2f5af 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.46.2.1 2005/01/30 00:59:31 imp Exp $");
 
 /*
  * CIS Handling for the Cardbus Bus
diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index 93c81e6519f14..428997011a177 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.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/cardbus/cardbus_cis.h,v 1.10.4.1 2005/01/30 00:59:31 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index 76332a0ddfd01..de5c00fda89fc 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.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/cardbus/cardbusreg.h,v 1.6.8.1 2005/01/30 00:59:31 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index a028e82cabc70..dae1030be730b 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.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/cardbus/cardbusvar.h,v 1.8.6.1 2005/01/30 00:59:31 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 9c58e8d24cdeb..e6f23a0c10dab 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.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/ciss/ciss.c,v 1.56.2.1.2.2 2005/04/28 20:45:58 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index baf9b88f2ea58..a5dc3b8fb70b7 100644
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.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/ciss/cissio.h,v 1.4 2004/07/29 08:06:22 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index 65fad48c1990a..4cb9162593ead 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.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/ciss/cissreg.h,v 1.14.6.1 2005/04/28 20:43:28 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index 24f8126a72ec5..4198d84ed8624 100644
--- a/sys/dev/ciss/cissvar.h
+++ b/sys/dev/ciss/cissvar.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/ciss/cissvar.h,v 1.9.6.1 2005/04/28 20:43:28 ps Exp $
  */
 
 /*
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index 8f7732fd80e1b..170b54afdb1de 100644
--- a/sys/dev/cm/if_cm_isa.c
+++ b/sys/dev/cm/if_cm_isa.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.5 2003/10/31 18:31:58 brooks Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index 4bfed9791d6f5..c91a4fb1918e0 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.14 2004/08/13 22:57:44 rwatson Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6reg.h b/sys/dev/cm/smc90cx6reg.h
index 35e7afd998b2e..f9dde5373c55c 100644
--- a/sys/dev/cm/smc90cx6reg.h
+++ b/sys/dev/cm/smc90cx6reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6reg.h,v 1.7 1999/02/16 23:34:13 is Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6reg.h,v 1.1 2002/01/08 20:03:12 fjoe Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6var.h b/sys/dev/cm/smc90cx6var.h
index 1703145d40930..e0f7d2f8fb0a2 100644
--- a/sys/dev/cm/smc90cx6var.h
+++ b/sys/dev/cm/smc90cx6var.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6var.h,v 1.5 2000/03/23 07:01:32 thorpej Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.3 2003/10/31 18:31:58 brooks Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index 9e2fdd4bea0d6..54b211b8d49fe 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.16 2004/05/23 16:11:46 mux Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/cnw/if_cnwioctl.h b/sys/dev/cnw/if_cnwioctl.h
index cc1b54890a998..c2ec7af5609bb 100644
--- a/sys/dev/cnw/if_cnwioctl.h
+++ b/sys/dev/cnw/if_cnwioctl.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_cnwioctl.h,v 1.2 1999/11/29 12:54:00 itojun Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cnw/if_cnwioctl.h,v 1.1.8.1 2005/01/30 00:59:32 imp Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 Berkeley Software Design, Inc.
diff --git a/sys/dev/cnw/if_cnwreg.h b/sys/dev/cnw/if_cnwreg.h
index 8b62d203d22c4..297f82d186587 100644
--- a/sys/dev/cnw/if_cnwreg.h
+++ b/sys/dev/cnw/if_cnwreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_cnwreg.h,v 1.3 2000/07/05 18:42:19 itojun Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cnw/if_cnwreg.h,v 1.1 2001/03/16 07:25:42 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cp/cpddk.c b/sys/dev/cp/cpddk.c
index 7c82f9b85208a..2e7fb564cc13f 100644
--- a/sys/dev/cp/cpddk.c
+++ b/sys/dev/cp/cpddk.c
@@ -18,7 +18,7 @@
  * $Cronyx: cpddk.c,v 1.13.4.37 2004/12/11 16:14:39 rik Exp $
  */									
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/cpddk.c,v 1.3.2.2 2005/01/30 00:59:32 imp Exp $");
 
 #include <dev/cx/machdep.h>
 
diff --git a/sys/dev/cp/cpddk.h b/sys/dev/cp/cpddk.h
index 3ff40bbd68d1d..393dda1b37f7c 100644
--- a/sys/dev/cp/cpddk.h
+++ b/sys/dev/cp/cpddk.h
@@ -16,7 +16,7 @@
  * works or modified versions.
  *
  * $Cronyx: cpddk.h,v 1.8.4.20 2004/12/06 16:21:06 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/cpddk.h,v 1.2.2.2 2005/01/30 00:59:32 imp Exp $
  */
 #define NBRD		6	/* the maximum number of installed boards */
 #define NCHAN		4	/* the number of channels on the board */
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index bcc818f53bdde..05953daa02d82 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.12.2.2 2005/02/07 21:33:40 rik Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/sys/dev/cp/ng_cp.h b/sys/dev/cp/ng_cp.h
index f35d817604996..4b8ca30b462af 100644
--- a/sys/dev/cp/ng_cp.h
+++ b/sys/dev/cp/ng_cp.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * $Cronyx: ng_cp.h,v 1.1.2.4 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/ng_cp.h,v 1.1.4.1 2005/01/30 00:59:32 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index eb93e546b9536..ace1162a564f1 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.33.2.2 2005/02/01 21:48:53 imp Exp $");
 
 /*
  *
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 8064f4b3a7a46..c3347c9ffd7b2 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.5.4.1 2005/01/30 00:59:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index 5aee2228a8330..9457186a2e243 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.11.2.2 2005/02/01 21:48:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index dc844c8cc810a..c209f34293b36 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cs/if_csreg.h,v 1.5.4.1 2005/01/30 00:59:32 imp Exp $
  */
 
 #define CS_89x0_IO_PORTS	0x0020
diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h
index 58f8b6f3aea9f..50728d66ba629 100644
--- a/sys/dev/cs/if_csvar.h
+++ b/sys/dev/cs/if_csvar.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/cs/if_csvar.h,v 1.2.4.2 2005/02/01 21:48:53 imp Exp $
  */
 
 #ifndef _IF_CSVAR_H
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c
index 0e48f77ad286f..4cac942e5ff5f 100644
--- a/sys/dev/ct/bshw_machdep.c
+++ b/sys/dev/ct/bshw_machdep.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.6.2.1 2005/01/30 00:59:33 imp Exp $");
 /*	$NetBSD$	*/
 
 /*-
diff --git a/sys/dev/ct/bshwvar.h b/sys/dev/ct/bshwvar.h
index ba42a72069795..fe479d2251f45 100644
--- a/sys/dev/ct/bshwvar.h
+++ b/sys/dev/ct/bshwvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/bshwvar.h,v 1.3.8.1 2005/01/30 00:59:33 imp Exp $ */
 /*	$NecBSD: bshwvar.h,v 1.3.14.3 2001/06/21 04:07:37 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ct/ct.c b/sys/dev/ct/ct.c
index 602e094509ca1..1f1ad51d97683 100644
--- a/sys/dev/ct/ct.c
+++ b/sys/dev/ct/ct.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.9.2.1 2005/01/30 00:59:33 imp Exp $");
 /*	$NetBSD$	*/
 
 #define	CT_DEBUG
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index b16b1d872f0ea..07d5b6c7dba6c 100644
--- a/sys/dev/ct/ct_isa.c
+++ b/sys/dev/ct/ct_isa.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.11.2.1 2005/01/30 00:59:33 imp Exp $");
 /*	$NetBSD$	*/
 
 /*-
diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index 2e069f5d33a12..3646f6d7742f9 100644
--- a/sys/dev/ct/ct_machdep.h
+++ b/sys/dev/ct/ct_machdep.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.5.8.1 2005/01/30 00:59:33 imp Exp $ */
 /*	$NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ct/ctvar.h b/sys/dev/ct/ctvar.h
index 8c63445e02004..f09a44476a0cd 100644
--- a/sys/dev/ct/ctvar.h
+++ b/sys/dev/ct/ctvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/ctvar.h,v 1.3.8.1 2005/01/30 00:59:33 imp Exp $ */
 /*	$NecBSD: ctvar.h,v 1.4.14.3 2001/06/20 06:13:34 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ctau/am8530.h b/sys/dev/ctau/am8530.h
index 09831c624ed7f..b3950d2df897a 100644
--- a/sys/dev/ctau/am8530.h
+++ b/sys/dev/ctau/am8530.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: am8530.h,v 1.1.2.2 2003/11/12 17:31:21 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/am8530.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctau.c b/sys/dev/ctau/ctau.c
index 9b4f40475af3e..100dfd4e687bc 100644
--- a/sys/dev/ctau/ctau.c
+++ b/sys/dev/ctau/ctau.c
@@ -17,7 +17,7 @@
  * Cronyx Id: ctau.c,v 1.1.2.4 2003/12/11 17:33:43 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/ctau.c,v 1.2.4.1 2005/01/30 00:59:33 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/ctau/ctau2fw.h b/sys/dev/ctau/ctau2fw.h
index 6d43f97258584..fcd1e819593dc 100644
--- a/sys/dev/ctau/ctau2fw.h
+++ b/sys/dev/ctau/ctau2fw.h
@@ -4,7 +4,7 @@
  * from the file `ctau2.dat'
  *
  * Cronyx Id: ctau2fw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctau2fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctau2_fw_len = 98448;
 
diff --git a/sys/dev/ctau/ctaue1fw.h b/sys/dev/ctau/ctaue1fw.h
index cb3311cd1d668..7058e2b91013f 100644
--- a/sys/dev/ctau/ctaue1fw.h
+++ b/sys/dev/ctau/ctaue1fw.h
@@ -4,7 +4,7 @@
  * from the file `ctaue1.dat'
  *
  * Cronyx Id: ctaue1fw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaue1fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctaue1_fw_len = 323982;
 
diff --git a/sys/dev/ctau/ctaufw.h b/sys/dev/ctau/ctaufw.h
index 354f2bac974d3..3212a4c3f683e 100644
--- a/sys/dev/ctau/ctaufw.h
+++ b/sys/dev/ctau/ctaufw.h
@@ -4,7 +4,7 @@
  * from the file `ctau.dat'
  *
  * Cronyx Id: ctaufw.h,v 1.1 2002/06/03 10:19:40 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaufw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctau_fw_len = 131234;
 
diff --git a/sys/dev/ctau/ctaug7fw.h b/sys/dev/ctau/ctaug7fw.h
index 523008932a0f4..8c487da76a72a 100644
--- a/sys/dev/ctau/ctaug7fw.h
+++ b/sys/dev/ctau/ctaug7fw.h
@@ -4,7 +4,7 @@
  * from the file `ctaug703.dat'
  *
  * Cronyx Id: ctaug7fw.h,v 1.1 2002/06/03 10:19:40 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaug7fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctaug703_fw_len = 323982;
 
diff --git a/sys/dev/ctau/ctaureg.h b/sys/dev/ctau/ctaureg.h
index 3cd2ce21ceddf..d20972fcac074 100644
--- a/sys/dev/ctau/ctaureg.h
+++ b/sys/dev/ctau/ctaureg.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ctaureg.h,v 1.1.2.1 2003/11/12 17:16:10 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaureg.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctddk.c b/sys/dev/ctau/ctddk.c
index 0a9dbd2fd46b6..a7eaf97d21eb5 100644
--- a/sys/dev/ctau/ctddk.c
+++ b/sys/dev/ctau/ctddk.c
@@ -21,7 +21,7 @@
  * Cronyx Id: ctddk.c,v 1.1.2.3 2003/11/14 16:55:36 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/ctddk.c,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/ctau/ctddk.h b/sys/dev/ctau/ctddk.h
index 99620902fc96b..100b13d052c1c 100644
--- a/sys/dev/ctau/ctddk.h
+++ b/sys/dev/ctau/ctddk.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ctddk.h,v 1.1.2.3 2003/12/11 17:33:44 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctddk.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 #define NBRD		3	/* the maximum number of installed boards */
 #define NPORT		32	/* the number of i/o ports per board */
diff --git a/sys/dev/ctau/ds2153.h b/sys/dev/ctau/ds2153.h
index 44ab02d41fe96..385d5171144a4 100644
--- a/sys/dev/ctau/ds2153.h
+++ b/sys/dev/ctau/ds2153.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ds2153.h,v 1.2.4.1 2003/11/12 17:22:33 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ds2153.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/hdc64570.h b/sys/dev/ctau/hdc64570.h
index 29d28cddb04c9..5a733738b2526 100644
--- a/sys/dev/ctau/hdc64570.h
+++ b/sys/dev/ctau/hdc64570.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: hdc64570.h,v 1.1.2.2 2003/11/12 17:31:21 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/hdc64570.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index b18dc9497b4a0..b36d9d749d78f 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.14.2.3 2005/02/07 21:50:36 rik Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/dev/ctau/lxt318.h b/sys/dev/ctau/lxt318.h
index a1064afca67c4..a1138d711a428 100644
--- a/sys/dev/ctau/lxt318.h
+++ b/sys/dev/ctau/lxt318.h
@@ -17,7 +17,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: lxt318.h,v 1.2.4.4 2003/11/14 19:08:45 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/lxt318.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 
 #define LX_WRITE	0x00
diff --git a/sys/dev/ctau/ng_ct.h b/sys/dev/ctau/ng_ct.h
index bd4d208e1204c..e55c4444db924 100644
--- a/sys/dev/ctau/ng_ct.h
+++ b/sys/dev/ctau/ng_ct.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  * 
  * Cronyx Id: ng_ct.h,v 1.1.2.3 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ng_ct.h,v 1.1.4.1 2005/01/30 00:59:33 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cx/cronyxfw.h b/sys/dev/cx/cronyxfw.h
index 56b2033b09abf..79027bea12bbe 100644
--- a/sys/dev/cx/cronyxfw.h
+++ b/sys/dev/cx/cronyxfw.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cronyxfw.h,v 1.1.2.1 2003/11/12 17:09:49 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cronyxfw.h,v 1.1.6.1 2005/01/30 00:59:34 imp Exp $
  */
 #define CRONYX_DAT_MAGIC 2001107011L	/* firmware file magic */
 
diff --git a/sys/dev/cx/csigma.c b/sys/dev/cx/csigma.c
index e880b88cbef02..4dba49d78a345 100644
--- a/sys/dev/cx/csigma.c
+++ b/sys/dev/cx/csigma.c
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: csigma.c,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/csigma.c,v 1.1.6.1 2005/01/30 00:59:34 imp Exp $
  */
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/cx/csigmafw.h b/sys/dev/cx/csigmafw.h
index a5e4e05d75424..b43af9605fed8 100644
--- a/sys/dev/cx/csigmafw.h
+++ b/sys/dev/cx/csigmafw.h
@@ -4,7 +4,7 @@
  * from the file `csigma.dat'
  *
  * Cronyx Id: csigmafw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/csigmafw.h,v 1.1 2003/12/03 07:29:38 imp Exp $
  */
 long csigma_fw_len = 131234;
 
diff --git a/sys/dev/cx/cxddk.c b/sys/dev/cx/cxddk.c
index bbcc904051e82..68c44ee1d5c0c 100644
--- a/sys/dev/cx/cxddk.c
+++ b/sys/dev/cx/cxddk.c
@@ -17,7 +17,7 @@
  * Cronyx Id: cxddk.c,v 1.1.2.2 2003/11/27 14:24:50 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cx/cxddk.c,v 1.1.6.1 2005/01/30 00:59:34 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/cx/cxddk.h b/sys/dev/cx/cxddk.h
index bd95aa6e254c0..8935f65e9714c 100644
--- a/sys/dev/cx/cxddk.h
+++ b/sys/dev/cx/cxddk.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cxddk.h,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cxddk.h,v 1.1.6.1 2005/01/30 00:59:34 imp Exp $
  */
 
 #ifndef port_t
diff --git a/sys/dev/cx/cxreg.h b/sys/dev/cx/cxreg.h
index 70a937d112800..4433b6aba6555 100644
--- a/sys/dev/cx/cxreg.h
+++ b/sys/dev/cx/cxreg.h
@@ -13,7 +13,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cxreg.h,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cxreg.h,v 1.1.6.1 2005/01/30 00:59:34 imp Exp $
  */
 #define REVCL_MIN   7		/* CD2400 min. revision number G */
 #define REVCL_MAX   13		/* CD2400 max. revision number M */
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index a3dbbe9cb400c..db9c86d2ce222 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.30.2.3 2005/02/07 21:57:02 rik Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/cx/machdep.h b/sys/dev/cx/machdep.h
index d00f3a90bb456..ad4edfb3515bd 100644
--- a/sys/dev/cx/machdep.h
+++ b/sys/dev/cx/machdep.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/machdep.h,v 1.2.4.1 2005/01/30 00:59:34 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cx/ng_cx.h b/sys/dev/cx/ng_cx.h
index 30b3c14daa4ee..f055b4860f344 100644
--- a/sys/dev/cx/ng_cx.h
+++ b/sys/dev/cx/ng_cx.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * Cronyx Id: ng_cx.h,v 1.1.2.3 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/ng_cx.h,v 1.2.4.1 2005/01/30 00:59:34 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 04df7e109ec12..3e9c57c4fa65b 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.159 2004/07/15 20:47:37 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 8d6df24127a0b..128daf3c371f0 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy_isa.c,v 1.146 2004/05/30 20:08:29 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index dd119e9145a22..d75cf3e1c4e5f 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy_pci.c,v 1.35.2.1 2005/01/30 00:59:34 imp Exp $");
 
 #include "opt_cy_pci_fastintr.h"
 
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index 88a36eb4a65e2..6d643ff9c9bd9 100644
--- a/sys/dev/cy/cyreg.h
+++ b/sys/dev/cy/cyreg.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/cy/cyreg.h,v 1.9 1999/08/28 00:44:40 peter Exp $
  */
 
 /*
diff --git a/sys/dev/cy/cyvar.h b/sys/dev/cy/cyvar.h
index 15ee98ca3f89e..17ed741db2309 100644
--- a/sys/dev/cy/cyvar.h
+++ b/sys/dev/cy/cyvar.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/cy/cyvar.h,v 1.1 2004/05/01 17:44:03 bde Exp $
  */
 
 typedef u_char volatile *cy_addr;
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index 0bfbbe2fce8af..a02d0832f21c6 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.16.2.2 2005/03/02 10:45:30 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index daf9cb4e3b0ee..e3ad02244f88e 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.h,v 1.15 2003/10/23 15:05:31 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons.h,v 1.2.2.2 2005/03/02 10:45:30 obrien Exp $
  */
 
 #if defined(_KERNEL) || defined(_BOOT)
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index bfa91464a8340..a8e0ea506234f 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.4.2.2 2005/03/02 10:45:30 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index 7a3a6c16bfb64..f278237244a0c 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -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/dcons/dcons_os.c,v 1.6.2.1 2005/03/02 10:45:30 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.h b/sys/dev/dcons/dcons_os.h
index b1d1c627589c6..66255cdabae8d 100644
--- a/sys/dev/dcons/dcons_os.h
+++ b/sys/dev/dcons/dcons_os.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/dcons/dcons_os.h,v 1.2.2.1 2005/03/02 10:45:30 obrien Exp $
  */
 
 struct dcons_global {
diff --git a/sys/dev/dec/mc146818reg.h b/sys/dev/dec/mc146818reg.h
index 4a3df1c117b0e..eb7ada8bd3c32 100644
--- a/sys/dev/dec/mc146818reg.h
+++ b/sys/dev/dec/mc146818reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/dec/mc146818reg.h,v 1.3.8.1 2005/01/30 00:59:35 imp Exp $ */
 /*	$NetBSD: mc146818reg.h,v 1.2 1997/03/12 06:53:42 cgd Exp $	*/
 
 /*-
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index da8664e007af7..84e102fdb68bd 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,7 +1,7 @@
 /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dec/mcclock.c,v 1.8.4.1 2005/01/30 00:59:35 imp Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index 89bc6c4811946..d0e3977968ec5 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.4.8.1 2005/01/30 00:59:35 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h
index b0df9d2eff2c2..f0d94a5195ef4 100644
--- a/sys/dev/dec/mcclockvar.h
+++ b/sys/dev/dec/mcclockvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/dec/mcclockvar.h,v 1.4.8.1 2005/01/30 00:59:35 imp Exp $ */
 /* $NetBSD: mcclockvar.h,v 1.4 1997/06/22 08:02:19 jonathan Exp $ */
 
 /*-
diff --git a/sys/dev/digi/CX.bios.h b/sys/dev/digi/CX.bios.h
index 2c6e4cdf78d55..5813eaa4967b1 100644
--- a/sys/dev/digi/CX.bios.h
+++ b/sys/dev/digi/CX.bios.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/digi/CX.bios.h,v 1.1 2001/05/02 01:08:01 brian Exp $
  */
 
 const u_char CX_bios[] = {
diff --git a/sys/dev/digi/CX.c b/sys/dev/digi/CX.c
index 3a9aa31297cea..0f231d43a45da 100644
--- a/sys/dev/digi/CX.c
+++ b/sys/dev/digi/CX.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/CX.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/CX.fepos.h b/sys/dev/digi/CX.fepos.h
index 77ce089d73556..cf6f24166f93f 100644
--- a/sys/dev/digi/CX.fepos.h
+++ b/sys/dev/digi/CX.fepos.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/digi/CX.fepos.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char CX_fepos[] = {
diff --git a/sys/dev/digi/CX_PCI.bios.h b/sys/dev/digi/CX_PCI.bios.h
index 9a285409150d8..403e13fd7fe15 100644
--- a/sys/dev/digi/CX_PCI.bios.h
+++ b/sys/dev/digi/CX_PCI.bios.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/digi/CX_PCI.bios.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char CX_PCI_bios[] = {
diff --git a/sys/dev/digi/CX_PCI.c b/sys/dev/digi/CX_PCI.c
index 2a941f7ef5a5d..3c74188fcaf88 100644
--- a/sys/dev/digi/CX_PCI.c
+++ b/sys/dev/digi/CX_PCI.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/CX_PCI.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/CX_PCI.fepos.h b/sys/dev/digi/CX_PCI.fepos.h
index a42e76fdb154d..dbfe734740bfd 100644
--- a/sys/dev/digi/CX_PCI.fepos.h
+++ b/sys/dev/digi/CX_PCI.fepos.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/digi/CX_PCI.fepos.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char CX_PCI_fepos[] = {
diff --git a/sys/dev/digi/EPCX.bios.h b/sys/dev/digi/EPCX.bios.h
index d45651a195f18..33981d9d5c07a 100644
--- a/sys/dev/digi/EPCX.bios.h
+++ b/sys/dev/digi/EPCX.bios.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/digi/EPCX.bios.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_bios[] = {
diff --git a/sys/dev/digi/EPCX.c b/sys/dev/digi/EPCX.c
index a920eb66a2e70..ad3cea30aa35d 100644
--- a/sys/dev/digi/EPCX.c
+++ b/sys/dev/digi/EPCX.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/EPCX.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/EPCX.fepos.h b/sys/dev/digi/EPCX.fepos.h
index 590ce0fc81320..b42e6390ec6aa 100644
--- a/sys/dev/digi/EPCX.fepos.h
+++ b/sys/dev/digi/EPCX.fepos.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/digi/EPCX.fepos.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_fepos[] = {
diff --git a/sys/dev/digi/EPCX_PCI.bios.h b/sys/dev/digi/EPCX_PCI.bios.h
index 51fac5aa6f0a6..1693038b4c4a4 100644
--- a/sys/dev/digi/EPCX_PCI.bios.h
+++ b/sys/dev/digi/EPCX_PCI.bios.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/digi/EPCX_PCI.bios.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_PCI_bios[] = {
diff --git a/sys/dev/digi/EPCX_PCI.c b/sys/dev/digi/EPCX_PCI.c
index a9ef049ea6be1..36d23785040f5 100644
--- a/sys/dev/digi/EPCX_PCI.c
+++ b/sys/dev/digi/EPCX_PCI.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/EPCX_PCI.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/EPCX_PCI.fepos.h b/sys/dev/digi/EPCX_PCI.fepos.h
index 7d4380c7b4138..10c1c3484193a 100644
--- a/sys/dev/digi/EPCX_PCI.fepos.h
+++ b/sys/dev/digi/EPCX_PCI.fepos.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/digi/EPCX_PCI.fepos.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char EPCX_PCI_fepos[] = {
diff --git a/sys/dev/digi/Xe.bios.h b/sys/dev/digi/Xe.bios.h
index 73d2baa0f9e87..5638a7a0eb1db 100644
--- a/sys/dev/digi/Xe.bios.h
+++ b/sys/dev/digi/Xe.bios.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/digi/Xe.bios.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char Xe_bios[] = {
diff --git a/sys/dev/digi/Xe.c b/sys/dev/digi/Xe.c
index b1bb5e53f07ad..3b79aec2983fc 100644
--- a/sys/dev/digi/Xe.c
+++ b/sys/dev/digi/Xe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xe.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xe.fepos.h b/sys/dev/digi/Xe.fepos.h
index fa729b720f565..ef09e77486594 100644
--- a/sys/dev/digi/Xe.fepos.h
+++ b/sys/dev/digi/Xe.fepos.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/digi/Xe.fepos.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char Xe_fepos[] = {
diff --git a/sys/dev/digi/Xem.bios.h b/sys/dev/digi/Xem.bios.h
index 1ed1a535946cb..c041323f0fbae 100644
--- a/sys/dev/digi/Xem.bios.h
+++ b/sys/dev/digi/Xem.bios.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/digi/Xem.bios.h,v 1.1 2001/05/02 01:08:02 brian Exp $
  */
 
 const u_char Xem_bios[] = {
diff --git a/sys/dev/digi/Xem.c b/sys/dev/digi/Xem.c
index fb903b6245462..8f3fb4a561ea5 100644
--- a/sys/dev/digi/Xem.c
+++ b/sys/dev/digi/Xem.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xem.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xem.fepos.h b/sys/dev/digi/Xem.fepos.h
index 54b1463658eec..9acebfc09b065 100644
--- a/sys/dev/digi/Xem.fepos.h
+++ b/sys/dev/digi/Xem.fepos.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/digi/Xem.fepos.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char Xem_fepos[] = {
diff --git a/sys/dev/digi/Xr.bios.h b/sys/dev/digi/Xr.bios.h
index a0805ae9eb3b1..8f616160b6e89 100644
--- a/sys/dev/digi/Xr.bios.h
+++ b/sys/dev/digi/Xr.bios.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/digi/Xr.bios.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 static const u_char Xr_bios[] = {
diff --git a/sys/dev/digi/Xr.c b/sys/dev/digi/Xr.c
index 4d68c87d211ba..9d4cc59f5c615 100644
--- a/sys/dev/digi/Xr.c
+++ b/sys/dev/digi/Xr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xr.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xr.fepos.h b/sys/dev/digi/Xr.fepos.h
index 66fbd10e1d2fb..e91f93e754366 100644
--- a/sys/dev/digi/Xr.fepos.h
+++ b/sys/dev/digi/Xr.fepos.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/digi/Xr.fepos.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 static const u_char Xr_fepos[] = {
diff --git a/sys/dev/digi/con.CX-IBM.h b/sys/dev/digi/con.CX-IBM.h
index b0c9db315986b..b7871fe29ee61 100644
--- a/sys/dev/digi/con.CX-IBM.h
+++ b/sys/dev/digi/con.CX-IBM.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/digi/con.CX-IBM.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_CX_IBM[] = {
diff --git a/sys/dev/digi/con.CX.h b/sys/dev/digi/con.CX.h
index 8bfb77a81a038..c6b6f40e770f9 100644
--- a/sys/dev/digi/con.CX.h
+++ b/sys/dev/digi/con.CX.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/digi/con.CX.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_CX[] = {
diff --git a/sys/dev/digi/con.EPCX.h b/sys/dev/digi/con.EPCX.h
index 329c2f1f63f78..b005ac62d419b 100644
--- a/sys/dev/digi/con.EPCX.h
+++ b/sys/dev/digi/con.EPCX.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/digi/con.EPCX.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_EPCX[] = {
diff --git a/sys/dev/digi/con.MBank.h b/sys/dev/digi/con.MBank.h
index 89f2d0ae2901c..97647d27d4d7b 100644
--- a/sys/dev/digi/con.MBank.h
+++ b/sys/dev/digi/con.MBank.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/digi/con.MBank.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 const u_char con_MBank[] = {
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 41689a92ea734..f0ff88cbbb659 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.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/digi/digi.c,v 1.55.2.1 2005/02/05 23:42:58 dwhite Exp $
  */
 
 /*-
diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h
index 57dc2c98a510a..1fccd5726b4a4 100644
--- a/sys/dev/digi/digi.h
+++ b/sys/dev/digi/digi.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/digi/digi.h,v 1.17.2.1 2005/02/05 23:42:58 dwhite Exp $
  */
 
 #define	W(p)				(*(u_int16_t *)(p))
diff --git a/sys/dev/digi/digi_isa.c b/sys/dev/digi/digi_isa.c
index f1f4a5f9ab456..c977563fa6140 100644
--- a/sys/dev/digi/digi_isa.c
+++ b/sys/dev/digi/digi_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.13 2004/05/30 20:08:30 phk Exp $");
 
 /*-
  * TODO:
diff --git a/sys/dev/digi/digi_mod.h b/sys/dev/digi/digi_mod.h
index f1e8ced703744..50e00b1d7abfc 100644
--- a/sys/dev/digi/digi_mod.h
+++ b/sys/dev/digi/digi_mod.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/digi/digi_mod.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 #define	DIGI_MOD_VERSION	1
diff --git a/sys/dev/digi/digi_pci.c b/sys/dev/digi/digi_pci.c
index fafa5a1fbf089..acdca75bc2aaa 100644
--- a/sys/dev/digi/digi_pci.c
+++ b/sys/dev/digi/digi_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/digi_pci.c,v 1.11 2004/05/30 20:08:30 phk Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/digi/digi_pci.h b/sys/dev/digi/digi_pci.h
index 2273d0048dede..22163341655b8 100644
--- a/sys/dev/digi/digi_pci.h
+++ b/sys/dev/digi/digi_pci.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/digi/digi_pci.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 #define	PCI_VENDOR_DIGI		0x114F
diff --git a/sys/dev/digi/digireg.h b/sys/dev/digi/digireg.h
index 4a1641f92d7e7..ab7bb05c26c7d 100644
--- a/sys/dev/digi/digireg.h
+++ b/sys/dev/digi/digireg.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/digi/digireg.h,v 1.3 2003/08/07 15:04:24 jhb Exp $
  */
 
 struct global_data {
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 39171950f414d..8d7d3723b2a5c 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.15.2.1 2005/01/30 00:59:35 imp Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 5e2a039f68719..33d93cbb681cb 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.18.4.1 2005/03/02 10:56:11 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_isa.c b/sys/dev/dpt/dpt_isa.c
index c0ede88cf9d54..4acef1b3e9794 100644
--- a/sys/dev/dpt/dpt_isa.c
+++ b/sys/dev/dpt/dpt_isa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_isa.c,v 1.8 2004/03/17 17:50:30 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index a3fa41ba280f7..0a115ae648aa2 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.30.2.1 2005/03/02 10:56:11 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index db2f7b06603c6..62428fe3734b3 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -27,9 +27,9 @@
  * SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.48.2.1 2005/01/30 00:59:35 imp Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.48.2.1 2005/01/30 00:59:35 imp Exp $");
 
 /*
  * dpt_scsi.c: SCSI dependant code for the DPT driver
diff --git a/sys/dev/drm/ati_pcigart.h b/sys/dev/drm/ati_pcigart.h
index 0bdb3363313bd..0cd3c417e1d17 100644
--- a/sys/dev/drm/ati_pcigart.h
+++ b/sys/dev/drm/ati_pcigart.h
@@ -26,7 +26,7 @@
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.3.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index 167578308eb30..30561b373bdc8 100644
--- a/sys/dev/drm/drm.h
+++ b/sys/dev/drm/drm.h
@@ -32,7 +32,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm.h,v 1.7.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index c30ab875a8b8d..da20bd8a2b483 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.11.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #ifndef _DRM_P_H_
diff --git a/sys/dev/drm/drm_agpsupport.h b/sys/dev/drm/drm_agpsupport.h
index 4758a88e9d3c7..a3d3c82860be7 100644
--- a/sys/dev/drm/drm_agpsupport.h
+++ b/sys/dev/drm/drm_agpsupport.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_agpsupport.h,v 1.3.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_auth.h b/sys/dev/drm/drm_auth.h
index faa3ffcb02349..126e926838362 100644
--- a/sys/dev/drm/drm_auth.h
+++ b/sys/dev/drm/drm_auth.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_auth.h,v 1.5.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_bufs.h b/sys/dev/drm/drm_bufs.h
index 841fb1360da09..cdda84dd49b57 100644
--- a/sys/dev/drm/drm_bufs.h
+++ b/sys/dev/drm/drm_bufs.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.10.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_context.h b/sys/dev/drm/drm_context.h
index 177bd59673997..fe1fc2a7818fe 100644
--- a/sys/dev/drm/drm_context.h
+++ b/sys/dev/drm/drm_context.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.7.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_dma.h b/sys/dev/drm/drm_dma.h
index 9a0f2aa270620..8bbfb048055ec 100644
--- a/sys/dev/drm/drm_dma.h
+++ b/sys/dev/drm/drm_dma.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.8.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_drawable.h b/sys/dev/drm/drm_drawable.h
index d7381f17b1106..9ac498d0d81bf 100644
--- a/sys/dev/drm/drm_drawable.h
+++ b/sys/dev/drm/drm_drawable.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_drawable.h,v 1.3.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h
index 59bf0c83dc6c1..702a0b90e0e08 100644
--- a/sys/dev/drm/drm_drv.h
+++ b/sys/dev/drm/drm_drv.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.26.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 /*
diff --git a/sys/dev/drm/drm_fops.h b/sys/dev/drm/drm_fops.h
index 0e4b24c972971..ad61dec8c24a8 100644
--- a/sys/dev/drm/drm_fops.h
+++ b/sys/dev/drm/drm_fops.h
@@ -29,7 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.11.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_ioctl.h b/sys/dev/drm/drm_ioctl.h
index e04e47bd0609a..e3e5561146283 100644
--- a/sys/dev/drm/drm_ioctl.h
+++ b/sys/dev/drm/drm_ioctl.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.7.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_irq.h b/sys/dev/drm/drm_irq.h
index 89f5cda6b7455..bb54e8226acb1 100644
--- a/sys/dev/drm/drm_irq.h
+++ b/sys/dev/drm/drm_irq.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_irq.h,v 1.3.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 int DRM(irq_by_busid)( DRM_IOCTL_ARGS )
diff --git a/sys/dev/drm/drm_linux_list.h b/sys/dev/drm/drm_linux_list.h
index 12de8233f1500..592355f94d38d 100644
--- a/sys/dev/drm/drm_linux_list.h
+++ b/sys/dev/drm/drm_linux_list.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_linux_list.h,v 1.1.2.1 2005/01/30 00:59:35 imp Exp $
  */
 
 struct list_head {
diff --git a/sys/dev/drm/drm_lock.h b/sys/dev/drm/drm_lock.h
index bcdcbfe3dc05b..9b8f5c2b57a72 100644
--- a/sys/dev/drm/drm_lock.h
+++ b/sys/dev/drm/drm_lock.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.4.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h
index 1bf0e8e1470f7..5171765c3e96c 100644
--- a/sys/dev/drm/drm_memory.h
+++ b/sys/dev/drm/drm_memory.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.11.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_memory_debug.h b/sys/dev/drm/drm_memory_debug.h
index 1ce7ffe403c62..bfd04425e8e88 100644
--- a/sys/dev/drm/drm_memory_debug.h
+++ b/sys/dev/drm/drm_memory_debug.h
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_memory_debug.h,v 1.2.4.1 2005/01/30 00:59:35 imp Exp $
  */
 
 #include "drmP.h"
diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h
index c2fafad2fc327..dfc0197b82dfd 100644
--- a/sys/dev/drm/drm_os_freebsd.h
+++ b/sys/dev/drm/drm_os_freebsd.h
@@ -28,7 +28,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.20.2.3 2005/03/02 10:51:06 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/drm/drm_pci.h b/sys/dev/drm/drm_pci.h
index 12add61778e50..f684b3bbc958d 100644
--- a/sys/dev/drm/drm_pci.h
+++ b/sys/dev/drm/drm_pci.h
@@ -27,7 +27,7 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_pci.h,v 1.2.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_pciids.h b/sys/dev/drm/drm_pciids.h
index 0a8abc5cb4b34..c597156465296 100644
--- a/sys/dev/drm/drm_pciids.h
+++ b/sys/dev/drm/drm_pciids.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/drm/drm_pciids.h,v 1.1 2004/06/11 03:26:59 anholt Exp $ */
 /*
    This file is auto-generated from the drm_pciids.txt in the DRM CVS
    Please contact dri-devel@lists.sf.net to add new cards to this list
diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h
index cee32192f0b3c..485e03b02c745 100644
--- a/sys/dev/drm/drm_sarea.h
+++ b/sys/dev/drm/drm_sarea.h
@@ -28,7 +28,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.3.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef _DRM_SAREA_H_
diff --git a/sys/dev/drm/drm_scatter.h b/sys/dev/drm/drm_scatter.h
index a67f1c62d95c5..7299f8ba6ca69 100644
--- a/sys/dev/drm/drm_scatter.h
+++ b/sys/dev/drm/drm_scatter.h
@@ -27,7 +27,7 @@
  *   Gareth Hughes <gareth@valinux.com>
  *   Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.5.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/drm_sysctl.h b/sys/dev/drm/drm_sysctl.h
index 64b3408e9ca1c..3d62912498846 100644
--- a/sys/dev/drm/drm_sysctl.h
+++ b/sys/dev/drm/drm_sysctl.h
@@ -21,7 +21,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.7.2.2 2005/03/02 10:52:23 obrien Exp $
  */
 
 #ifdef __FreeBSD__
diff --git a/sys/dev/drm/drm_vm.h b/sys/dev/drm/drm_vm.h
index 23a6de74a47ad..3f314aaa2748d 100644
--- a/sys/dev/drm/drm_vm.h
+++ b/sys/dev/drm/drm_vm.h
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.11.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #if defined(__FreeBSD__) && __FreeBSD_version >= 500102
diff --git a/sys/dev/drm/mga.h b/sys/dev/drm/mga.h
index 6f463c31c8b4a..8afd86cadc26b 100644
--- a/sys/dev/drm/mga.h
+++ b/sys/dev/drm/mga.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga.h,v 1.5.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __MGA_H__
diff --git a/sys/dev/drm/mga_dma.c b/sys/dev/drm/mga_dma.c
index 57db72d6dad63..0fafc55b25ceb 100644
--- a/sys/dev/drm/mga_dma.c
+++ b/sys/dev/drm/mga_dma.c
@@ -32,7 +32,7 @@
  * Rewritten by:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.10.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/mga_drm.h b/sys/dev/drm/mga_drm.h
index fb851a9890bc1..13c7ce3dad644 100644
--- a/sys/dev/drm/mga_drm.h
+++ b/sys/dev/drm/mga_drm.h
@@ -31,7 +31,7 @@
  * Rewritten by:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drm.h,v 1.4.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __MGA_DRM_H__
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index 6de110a04e988..111c623f89d50 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.7.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index b4f333a6c09d7..5f565c7569775 100644
--- a/sys/dev/drm/mga_drv.h
+++ b/sys/dev/drm/mga_drv.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.7.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __MGA_DRV_H__
diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga_irq.c
index 82a2705add19a..4a268c96c1d4c 100644
--- a/sys/dev/drm/mga_irq.c
+++ b/sys/dev/drm/mga_irq.c
@@ -29,7 +29,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_irq.c,v 1.3.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/mga_state.c b/sys/dev/drm/mga_state.c
index 8e72f2200f671..5c83d16f549a3 100644
--- a/sys/dev/drm/mga_state.c
+++ b/sys/dev/drm/mga_state.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_state.c,v 1.8.4.1 2005/01/30 00:59:36 imp Exp $");
 
 #include "dev/drm/mga.h"
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_ucode.h b/sys/dev/drm/mga_ucode.h
index 575166e96d241..f488e443d34a0 100644
--- a/sys/dev/drm/mga_ucode.h
+++ b/sys/dev/drm/mga_ucode.h
@@ -25,7 +25,7 @@
  * Kernel-based WARP engine management:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_ucode.h,v 1.1.10.1 2005/01/30 00:59:36 imp Exp $
  */
 
 /*
diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga_warp.c
index db292dd69bdd4..aa74238e4137a 100644
--- a/sys/dev/drm/mga_warp.c
+++ b/sys/dev/drm/mga_warp.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/mga_warp.c,v 1.5.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/r128.h b/sys/dev/drm/r128.h
index 0b0fc928b1815..63dec63ac5f13 100644
--- a/sys/dev/drm/r128.h
+++ b/sys/dev/drm/r128.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128.h,v 1.6.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __R128_H__
diff --git a/sys/dev/drm/r128_cce.c b/sys/dev/drm/r128_cce.c
index 75a3c30153371..118ac43781516 100644
--- a/sys/dev/drm/r128_cce.c
+++ b/sys/dev/drm/r128_cce.c
@@ -27,7 +27,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_cce.c,v 1.10.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/r128_drm.h b/sys/dev/drm/r128_drm.h
index 32a58daa13b0f..bef6213bc858f 100644
--- a/sys/dev/drm/r128_drm.h
+++ b/sys/dev/drm/r128_drm.h
@@ -28,7 +28,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Kevin E. Martin <martin@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drm.h,v 1.5.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __R128_DRM_H__
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index 16035fccd7473..761e5f8bc2999 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -28,7 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.7.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h
index 8d8f877943305..d136cea07fac6 100644
--- a/sys/dev/drm/r128_drv.h
+++ b/sys/dev/drm/r128_drv.h
@@ -30,7 +30,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Michel D�nzer <daenzerm@student.ethz.ch>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_drv.h,v 1.8.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __R128_DRV_H__
diff --git a/sys/dev/drm/r128_irq.c b/sys/dev/drm/r128_irq.c
index fa3fb43f3cfe4..9004b43f7839e 100644
--- a/sys/dev/drm/r128_irq.c
+++ b/sys/dev/drm/r128_irq.c
@@ -29,7 +29,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_irq.c,v 1.3.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c
index 5286e29c606f8..ffbdca2efa32a 100644
--- a/sys/dev/drm/r128_state.c
+++ b/sys/dev/drm/r128_state.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/r128_state.c,v 1.10.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/radeon.h b/sys/dev/drm/radeon.h
index f7f9708c07b46..72c4dae82f897 100644
--- a/sys/dev/drm/radeon.h
+++ b/sys/dev/drm/radeon.h
@@ -27,7 +27,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Keith Whitwell <keith@tungstengraphics.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon.h,v 1.9.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __RADEON_H__
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c
index 2418f803a871e..3adf045ffda92 100644
--- a/sys/dev/drm/radeon_cp.c
+++ b/sys/dev/drm/radeon_cp.c
@@ -27,7 +27,7 @@
  *    Kevin E. Martin <martin@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.11.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/radeon_drm.h b/sys/dev/drm/radeon_drm.h
index b0e59aa620a80..4bd1b79408d71 100644
--- a/sys/dev/drm/radeon_drm.h
+++ b/sys/dev/drm/radeon_drm.h
@@ -29,7 +29,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Keith Whitwell <keith@tungstengraphics.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drm.h,v 1.8.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __RADEON_DRM_H__
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index ca94080d2696d..90726eaecf5cc 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.9.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon_drv.h
index ab694dec9f8ae..eb2852ed14a91 100644
--- a/sys/dev/drm/radeon_drv.h
+++ b/sys/dev/drm/radeon_drv.h
@@ -27,7 +27,7 @@
  *    Kevin E. Martin <martin@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.10.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __RADEON_DRV_H__
diff --git a/sys/dev/drm/radeon_irq.c b/sys/dev/drm/radeon_irq.c
index 2d600a4e51c16..632b48f38e9c1 100644
--- a/sys/dev/drm/radeon_irq.c
+++ b/sys/dev/drm/radeon_irq.c
@@ -29,7 +29,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Michel D�nzer <michel@daenzer.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.4.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon_mem.c
index 472b21f1e92c8..b7f5dc82ea047 100644
--- a/sys/dev/drm/radeon_mem.c
+++ b/sys/dev/drm/radeon_mem.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_mem.c,v 1.5.2.1 2005/01/30 00:59:36 imp Exp $");
 
 #include "dev/drm/radeon.h"
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/radeon_state.c b/sys/dev/drm/radeon_state.c
index 70e1b071ab2a1..e4c93be651c1d 100644
--- a/sys/dev/drm/radeon_state.c
+++ b/sys/dev/drm/radeon_state.c
@@ -26,7 +26,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *    Kevin E. Martin <martin@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.11.2.2 2005/03/02 10:48:10 obrien Exp $
  */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/sis.h b/sys/dev/drm/sis.h
index dde5d9555195b..dc765a1c9f154 100644
--- a/sys/dev/drm/sis.h
+++ b/sys/dev/drm/sis.h
@@ -23,7 +23,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis.h,v 1.3.2.1 2005/01/30 00:59:36 imp Exp $
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis.h,v 1.3 2002/10/30 12:52:38 alanh Exp $ */
 
diff --git a/sys/dev/drm/sis_drm.h b/sys/dev/drm/sis_drm.h
index 18711a5d17759..a7f34918491bf 100644
--- a/sys/dev/drm/sis_drm.h
+++ b/sys/dev/drm/sis_drm.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_drm.h,v 1.4 2003/09/09 00:24:31 anholt Exp $
  */
 
 #ifndef __SIS_DRM_H__
diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c
index 5009f9d940bf3..d112969d1d9d6 100644
--- a/sys/dev/drm/sis_drv.c
+++ b/sys/dev/drm/sis_drv.c
@@ -23,7 +23,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_drv.c,v 1.3.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/sis.h"
diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis_drv.h
index 156e2b24787e0..36149267046b7 100644
--- a/sys/dev/drm/sis_drv.h
+++ b/sys/dev/drm/sis_drv.h
@@ -23,7 +23,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_drv.h,v 1.1.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef _SIS_DRV_H_
diff --git a/sys/dev/drm/sis_ds.c b/sys/dev/drm/sis_ds.c
index cf837a7e504c5..eb0b17d50cb86 100644
--- a/sys/dev/drm/sis_ds.c
+++ b/sys/dev/drm/sis_ds.c
@@ -26,7 +26,7 @@
  * Authors:
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_ds.c,v 1.1.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/sis.h"
diff --git a/sys/dev/drm/sis_ds.h b/sys/dev/drm/sis_ds.h
index ce9535bf926df..f3882691bbd1f 100644
--- a/sys/dev/drm/sis_ds.h
+++ b/sys/dev/drm/sis_ds.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.2.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __SIS_DS_H__
diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis_mm.c
index 6464c4c3b89b7..c1ea1ca2b948f 100644
--- a/sys/dev/drm/sis_mm.c
+++ b/sys/dev/drm/sis_mm.c
@@ -27,7 +27,7 @@
  * Authors:
  *    Sung-Ching Lin <sclin@sis.com.tw>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/sis_mm.c,v 1.4.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/sis.h"
diff --git a/sys/dev/drm/tdfx.h b/sys/dev/drm/tdfx.h
index 9a8cf720e8517..3b2742e0bc859 100644
--- a/sys/dev/drm/tdfx.h
+++ b/sys/dev/drm/tdfx.h
@@ -26,7 +26,7 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/tdfx.h,v 1.4.2.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #ifndef __TDFX_H__
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index 4985ee05762b2..4db3c4375a457 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -29,7 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.6.4.1 2005/01/30 00:59:36 imp Exp $
  */
 
 #include "dev/drm/tdfx.h"
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 132975377a119..61e9811a4f3f9 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.233.2.5 2005/02/02 22:44:24 imp Exp $");
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
diff --git a/sys/dev/ed/if_ed98.h b/sys/dev/ed/if_ed98.h
index 2a2af0498cca9..c724edcf99bdf 100644
--- a/sys/dev/ed/if_ed98.h
+++ b/sys/dev/ed/if_ed98.h
@@ -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/ed/if_ed98.h,v 1.1.10.1 2005/01/30 00:59:38 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 1f8424355c1ff..b541ca2ac9124 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.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_cbus.c,v 1.12.4.2 2005/01/30 00:59:38 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index 3a5804c8dcdd7..786ef52a3932b 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.15.4.1 2005/01/30 00:59:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index b1994c311cbca..a79b6689d6b16 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.59.2.3 2005/02/02 22:46:13 imp Exp $
  */
 
 #include "opt_ed.h"
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index e8d12b84fabd5..0cee85f14d0e4 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.36.2.1 2005/02/02 22:44:25 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index cfe5b7053142e..a379154e65c27 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.32.4.1 2005/01/30 00:59:38 imp Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index 459907bf99ca4..f9b0ae2cd4015 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.18.2.2 2005/02/02 22:44:25 imp Exp $
  */
 
 #ifndef SYS_DEV_ED_IF_EDVAR_H
diff --git a/sys/dev/eisa/eisa_if.m b/sys/dev/eisa/eisa_if.m
index 72c8184cdce5e..4504e0aa82359 100644
--- a/sys/dev/eisa/eisa_if.m
+++ b/sys/dev/eisa/eisa_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/eisa/eisa_if.m,v 1.1.2.1 2005/01/30 00:59:38 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index b9c77f5b5c604..fb1de9bc6945c 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.69.2.1 2005/01/30 00:59:38 imp Exp $");
 
 #include "opt_eisa.h"
 
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 522cd5db59e14..d398ae532dd81 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.23.2.1 2005/01/30 00:59:38 imp Exp $
  */
 
 #ifndef _DEV_EISA_EISACONF_H_
diff --git a/sys/dev/em/LICENSE b/sys/dev/em/LICENSE
index 42545ca85f973..ea410f9f89d4e 100644
--- a/sys/dev/em/LICENSE
+++ b/sys/dev/em/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/LICENSE,v 1.2.6.1 2005/01/30 00:59:38 imp Exp $
 /*-
 Copyright (c) 2001-2003, Intel Corporation 
 All rights reserved.
diff --git a/sys/dev/em/README b/sys/dev/em/README
index 5f4f715ae3d46..33b31651b9b6f 100644
--- a/sys/dev/em/README
+++ b/sys/dev/em/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/README,v 1.8 2003/08/27 21:52:36 pdeuskar Exp $
 FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters
 ============================================================
 
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 5a0cc40f9b67b..8db8811eded90 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.44.2.8 2005/03/23 13:30:21 glebius Exp $*/
 
 #include <dev/em/if_em.h>
 
diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h
index 5d795166cfa1f..7265e30b86577 100644
--- a/sys/dev/em/if_em.h
+++ b/sys/dev/em/if_em.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.25.2.4 2005/03/23 13:30:21 glebius Exp $*/
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
diff --git a/sys/dev/em/if_em_hw.c b/sys/dev/em/if_em_hw.c
index ee3be59c34b26..91ca47077f8fe 100644
--- a/sys/dev/em/if_em_hw.c
+++ b/sys/dev/em/if_em_hw.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.13.2.1 2004/10/15 22:12:59 tackerman Exp $");
 
 #include <dev/em/if_em_hw.h>
 
diff --git a/sys/dev/em/if_em_hw.h b/sys/dev/em/if_em_hw.h
index f3574bd4de5e3..5b7ee18eec82d 100644
--- a/sys/dev/em/if_em_hw.h
+++ b/sys/dev/em/if_em_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.13.2.1 2004/10/15 22:12:59 tackerman Exp $*/
 /* if_em_hw.h
  * Structures, enums, and macros for the MAC
  */
diff --git a/sys/dev/em/if_em_osdep.h b/sys/dev/em/if_em_osdep.h
index 5c010ec25ec9d..08186908a8169 100644
--- a/sys/dev/em/if_em_osdep.h
+++ b/sys/dev/em/if_em_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/em/if_em_osdep.h,v 1.13 2003/08/22 05:54:51 imp Exp $*/
 
 #ifndef _FREEBSD_OS_H_
 #define _FREEBSD_OS_H_
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 1aaf76108b82c..895e363d37306 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.33.2.1 2005/01/30 00:59:39 imp Exp $");
 
 /*
  * i f _ e n _ p c i . c  
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.33.2.1 2005/01/30 00:59:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 265b60ea78331..90f0b26b3e3bf 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.63.2.1 2005/01/30 00:59:39 imp Exp $");
 
 /*
  *
diff --git a/sys/dev/en/midwayreg.h b/sys/dev/en/midwayreg.h
index 5c2fe1b8fdbd7..8f214da442201 100644
--- a/sys/dev/en/midwayreg.h
+++ b/sys/dev/en/midwayreg.h
@@ -6,7 +6,7 @@
  * this file contains the description of the ENI ATM midway chip
  * data structures.   see midway.c for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/en/midwayreg.h,v 1.5 2003/04/25 16:14:03 harti Exp $
  */
 
 #define MID_SZTOB(X) 	((X) * 256 * 4) /* size to bytes */
diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h
index 27e047deffef2..80cbd02ef0c5c 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.h
@@ -30,7 +30,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/midwayvar.h,v 1.13.4.1 2005/01/30 00:59:39 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index a8605027d08a2..e1e95e4c6bfa3 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.133.2.2 2005/02/01 21:45:16 imp Exp $");
 
 /*
  *	Modified from the FreeBSD 1.1.5.1 version by:
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index 319b561ee0a18..fead8a2a7b140 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.31.2.2 2005/02/01 21:45:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index 407b689d03e52..1faa36fdd4920 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.24.2.2 2005/02/01 21:45:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c
index 5cb74d49b6176..834fc8d9b4fb8 100644
--- a/sys/dev/ep/if_ep_mca.c
+++ b/sys/dev/ep/if_ep_mca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_mca.c,v 1.10.2.1 2005/02/01 21:45:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index de2382fccf358..8402d678a569d 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.38.2.2 2005/02/01 21:45:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 6f8e968802bd8..b6079b11d6a77 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.36.4.1 2005/01/30 00:59:39 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 14a0165248508..b95a0f1936c44 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.13.4.1 2005/02/01 21:45:16 imp Exp $
  */
 
 struct ep_board {
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index ba8f38209ad48..583ed52741c8e 100644
--- a/sys/dev/esp/esp_sbus.c
+++ b/sys/dev/esp/esp_sbus.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.6.2.1 2004/09/16 03:48:43 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/lsi64854.c b/sys/dev/esp/lsi64854.c
index 6216560716e49..74fd24b3f44f1 100644
--- a/sys/dev/esp/lsi64854.c
+++ b/sys/dev/esp/lsi64854.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/lsi64854.c,v 1.2 2004/08/02 22:55:23 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/lsi64854reg.h b/sys/dev/esp/lsi64854reg.h
index 763d312feefd9..3fe1ec6c2989a 100644
--- a/sys/dev/esp/lsi64854reg.h
+++ b/sys/dev/esp/lsi64854reg.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/esp/lsi64854reg.h,v 1.1 2004/06/10 05:11:39 scottl Exp $ */
 
 /*
  * LSI 64854 DMA engine. Contains three independent channels
diff --git a/sys/dev/esp/lsi64854var.h b/sys/dev/esp/lsi64854var.h
index 03e1d7d748921..9c61cbbecf627 100644
--- a/sys/dev/esp/lsi64854var.h
+++ b/sys/dev/esp/lsi64854var.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/esp/lsi64854var.h,v 1.2 2004/08/02 22:55:23 trhodes Exp $ */
 
 struct lsi64854_softc {
 	device_t		sc_dev;
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index a222f3e366a8f..12f30d4afa67b 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -104,7 +104,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.6.2.1 2005/01/30 00:59:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index d85cb452a46ab..0030bb9af1f5b 100644
--- a/sys/dev/esp/ncr53c9xreg.h
+++ b/sys/dev/esp/ncr53c9xreg.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/esp/ncr53c9xreg.h,v 1.2.2.1 2005/01/30 00:59:39 imp Exp $ */
 
 /*
  * Register addresses, relative to some base address
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index f8be39edd40e6..a61e890502402 100644
--- a/sys/dev/esp/ncr53c9xvar.h
+++ b/sys/dev/esp/ncr53c9xvar.h
@@ -66,7 +66,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/esp/ncr53c9xvar.h,v 1.4.2.1 2005/01/30 00:59:39 imp Exp $ */
 
 #ifndef _DEV_IC_NCR53C9XVAR_H_
 #define _DEV_IC_NCR53C9XVAR_H_
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 33598ba0a155e..82effbf83a60d 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.53.2.2 2005/01/30 00:59:40 imp Exp $");
 
 /*
  * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index 310f554ae22d0..1d604e0c577a2 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.10 2004/06/28 16:38:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c
index 16b9d2045f9ee..bb8aab037e6fb 100644
--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.10.2.1 2005/02/01 21:42:25 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ex/if_exreg.h b/sys/dev/ex/if_exreg.h
index 157eda37298c1..86b745d9ff61d 100644
--- a/sys/dev/ex/if_exreg.h
+++ b/sys/dev/ex/if_exreg.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/ex/if_exreg.h,v 1.5.6.1 2005/01/30 00:59:40 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index 6427f1fcd4942..b98a7ccbb2c1d 100644
--- a/sys/dev/ex/if_exvar.h
+++ b/sys/dev/ex/if_exvar.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/ex/if_exvar.h,v 1.5 2004/06/27 13:10:20 imp Exp $
  */
 
 struct ex_softc {
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 3700cbd44cbea..461bf39849bef 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.17.2.1 2005/01/24 06:58:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index 094379e79c772..b40515e964966 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/exca/excareg.h,v 1.4.4.1 2005/01/30 00:59:40 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 M Warner Losh.  All rights reserved.
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index bc29c81a09907..a9ae754970316 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/exca/excavar.h,v 1.6.2.1 2005/01/30 00:59:40 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 M Warner Losh.  All rights reserved.
diff --git a/sys/dev/fatm/firmware.h b/sys/dev/fatm/firmware.h
index 24c7bc8e88659..66e7e10e142dc 100644
--- a/sys/dev/fatm/firmware.h
+++ b/sys/dev/fatm/firmware.h
@@ -37,7 +37,7 @@
  *
  * phk got permission from Fore to put firmware images into our tree.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/firmware.h,v 1.1.4.1 2005/01/30 00:59:40 imp Exp $
  */
 
 static uint32_t firmware[] = {
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index 35ef8b9fffaf0..6a14dd2c33eeb 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.14.2.1 2005/01/30 00:59:40 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/fatm/if_fatm_rate.h b/sys/dev/fatm/if_fatm_rate.h
index 5cfd38a9c28ce..757a78e2de306 100644
--- a/sys/dev/fatm/if_fatm_rate.h
+++ b/sys/dev/fatm/if_fatm_rate.h
@@ -35,7 +35,7 @@
  *	    for(i=period-1; i>0; i--) printf "{ 0x%08x, %u },\n", \
  *		(i * 65536) + (period - i), i * linerate/period; }'
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatm_rate.h,v 1.1.4.1 2005/01/30 00:59:40 imp Exp $
  */
 { 0x00000000, 353053 },
 { 0x00fe0001, 351668 },
diff --git a/sys/dev/fatm/if_fatmreg.h b/sys/dev/fatm/if_fatmreg.h
index d488dbfda5bf2..68829f6e85029 100644
--- a/sys/dev/fatm/if_fatmreg.h
+++ b/sys/dev/fatm/if_fatmreg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatmreg.h,v 1.1.4.1 2005/01/30 00:59:40 imp Exp $
  *
  * Fore PCA200E hardware definitions.
  */
diff --git a/sys/dev/fatm/if_fatmvar.h b/sys/dev/fatm/if_fatmvar.h
index 8c550fefdd1dd..3bbac10b60ac4 100644
--- a/sys/dev/fatm/if_fatmvar.h
+++ b/sys/dev/fatm/if_fatmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatmvar.h,v 1.4.4.1 2005/01/30 00:59:40 imp Exp $
  *
  * Fore PCA200E driver definitions.
  */
diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index 9b924e763e788..2e674e16081f8 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/boot_font.c,v 1.3 2003/08/24 17:46:06 obrien Exp $");
 
 /*
  * This font lives in the public domain. It it a PC font, IBM encoding,
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/boot_font.c,v 1.3 2003/08/24 17:46:06 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c
index 00cf4149b7fac..bd4dbb7f584ed 100644
--- a/sys/dev/fb/creator.c
+++ b/sys/dev/fb/creator.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/fb/creator.c,v 1.5 2004/07/09 23:12:22 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 0878feb299d0a..e8ace87e8b2a6 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.32 2004/07/15 08:26:00 phk Exp $");
 
 #include "opt_fb.h"
 
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 7db63152accf1..82e5d7a9d8a06 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.18 2004/01/21 05:08:51 grehan Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/gallant12x22.h b/sys/dev/fb/gallant12x22.h
index a089f6a2ec46b..84288cc9bf10d 100644
--- a/sys/dev/fb/gallant12x22.h
+++ b/sys/dev/fb/gallant12x22.h
@@ -35,7 +35,7 @@
  *
  * Derived from: @(#)gallant19.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/gallant12x22.h,v 1.2.2.1 2005/01/30 00:59:41 imp Exp $
  */
 
 static u_char gallant12x22_data[] = {
diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c
index 63a317d8bb52a..8e51d99adb688 100644
--- a/sys/dev/fb/gfb.c
+++ b/sys/dev/fb/gfb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.5 2003/08/24 17:46:06 obrien Exp $");
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.5 2003/08/24 17:46:06 obrien Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h
index 89ead2e3a225b..3086090b9d0cc 100644
--- a/sys/dev/fb/gfb.h
+++ b/sys/dev/fb/gfb.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/gfb.h,v 1.2.2.1 2005/01/30 00:59:41 imp Exp $
  */
 
 #ifndef _FB_GFB_H_
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 6096bdf932f0d..71e856dbc897d 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/s3_pci.c,v 1.7 2004/03/17 17:50:32 njl Exp $");
 
 /* Enable LFB on S3 cards that has only VESA 1.2 BIOS */
 
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index ec25d1cf03a40..8b8938e86989d 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/splash.c,v 1.14 2004/05/30 20:08:31 phk Exp $");
 
 #include "opt_splash.h"
 
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index ca4885c63ebb6..6cabbce771bc7 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.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/fb/splash_bmp.c,v 1.19 2004/08/06 20:37:08 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index e67bb244e4a16..5890844321073 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.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/fb/splash_pcx.c,v 1.8 2004/08/06 21:35:51 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index 36ba9a708d895..ff3822e99c6b0 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.6 2004/07/15 08:26:01 phk Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/tga.c b/sys/dev/fb/tga.c
index 08ca193a23095..8a60efb122518 100644
--- a/sys/dev/fb/tga.c
+++ b/sys/dev/fb/tga.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.5 2004/06/03 06:09:58 phk Exp $");
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.5 2004/06/03 06:09:58 phk Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/fb/tga.h b/sys/dev/fb/tga.h
index 3616b61bd04c9..08bbe340614d4 100644
--- a/sys/dev/fb/tga.h
+++ b/sys/dev/fb/tga.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/tga.h,v 1.1.10.1 2005/01/30 00:59:41 imp Exp $
  */
 
 #ifndef _FB_TGA_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 55530bb43a4f4..c3a71fefb0c7b 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.31.2.2 2005/02/14 09:34:40 obrien Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 4ccef40d616f3..860511895cfb7 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.7.2.1 2005/03/13 21:39:29 iedowse Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 7c81f960c64c5..98e15027af26c 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.283.2.7 2005/03/01 08:22:55 yongari Exp $");
 
 #include "opt_fdc.h"
 
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index 6a3cacd5e722b..53464675d0574 100644
--- a/sys/dev/fdc/fdc_acpi.c
+++ b/sys/dev/fdc/fdc_acpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.2.2.3 2004/09/30 20:04:56 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index 5447294dd0c87..7a9eba6fcd745 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.9.2.5 2005/01/30 00:59:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index 8f7154ab98aa2..30cb05ee01764 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_pccard.c,v 1.8.2.2 2005/01/30 00:59:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index b0077b6822c1b..09595654f02f1 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.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/fdc/fdcvar.h,v 1.3.2.2 2005/01/30 00:59:41 imp Exp $
  */
 
 /* XXX should audit this file to see if additional copyrights needed */
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index e4e39a6f313b8..27b000812601f 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.86.2.2 2005/02/03 00:34:46 imp Exp $");
 
 /*
  *
diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index f35624362ef6b..717a272fc6dd1 100644
--- a/sys/dev/fe/if_fe_cbus.c
+++ b/sys/dev/fe/if_fe_cbus.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.9.4.2 2005/02/03 00:34:46 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe_isa.c b/sys/dev/fe/if_fe_isa.c
index 940be5b00196f..c594d50c9c7a7 100644
--- a/sys/dev/fe/if_fe_isa.c
+++ b/sys/dev/fe/if_fe_isa.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_isa.c,v 1.5.4.2 2005/02/03 00:34:46 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c
index b887620acecbf..084d46837068f 100644
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.12.2.2 2005/02/03 00:34:46 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index afc9c5704c58c..0d796875ad46d 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/fe/if_fereg.h,v 1.8.10.1 2005/01/30 00:59:41 imp Exp $ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/dev/fe/if_fevar.h b/sys/dev/fe/if_fevar.h
index bdf9637ad9861..c09a9a99c24bd 100644
--- a/sys/dev/fe/if_fevar.h
+++ b/sys/dev/fe/if_fevar.h
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fe/if_fevar.h,v 1.2.4.2 2005/02/03 00:34:46 imp Exp $
  */
 
 /* How many registers does an fe-supported adapter have at maximum?  */
diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README
index d879f31a6b15d..59e3c5fa99fe2 100644
--- a/sys/dev/firewire/00README
+++ b/sys/dev/firewire/00README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/firewire/00README,v 1.1 2002/09/13 12:31:56 ikob Exp $
 
 IEEE 1394 support for FreeBSD-5.X and 4.X.
 
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 9636b12ad6e38..372e330540879 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.78.2.2 2005/03/02 20:29:18 jmg Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index ab34748bec258..2af127c50ba6a 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.19.2.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 42feff2d27c8b..48dceaf896193 100644
--- a/sys/dev/firewire/firewire_phy.h
+++ b/sys/dev/firewire/firewire_phy.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/firewire/firewire_phy.h,v 1.2.6.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 3b991ea652362..e5b89db6c764c 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.36.2.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index 4c09075a936fe..cd9e472024d67 100644
--- a/sys/dev/firewire/fwcrom.c
+++ b/sys/dev/firewire/fwcrom.c
@@ -34,7 +34,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.11 2004/05/22 16:14:17 dfr Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index 79c74af9fe84f..cce62ec3505c2 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.44.2.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index c64dbe66731a2..df803e26909ba 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -35,7 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.6.2.1 2005/01/30 00:59:41 imp Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index 3a8278c1c709f..1d854a0bc66eb 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.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/firewire/fwdma.h,v 1.2.6.1 2005/01/30 00:59:41 imp Exp $
  */
 
 struct fwdma_alloc {
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index 4fac8dd06b4dc..7275486bb5c4a 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -35,7 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.29.2.2 2005/01/30 00:59:41 imp Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index de717947e8445..ab12547fca6a8 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.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/firewire/fwmem.h,v 1.7.2.1 2005/01/30 00:59:41 imp Exp $
  */
 
 struct fw_xfer *fwmem_read_quad(struct fw_device *, caddr_t, uint8_t,
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index ddcd05d0bccfa..0f06f9b22b7a1 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.79.2.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index 154f0dfb49801..6da4046db97ee 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.48.2.2 2005/01/30 00:59:41 imp Exp $
  */
 
 #define BOUNCE_BUFFER_TEST	0
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 39986223c4bf1..2692bb5173433 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohcireg.h,v 1.20.2.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 3002b63c0ce40..40793f2e8954b 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.13.2.1 2005/01/30 00:59:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index 77a006ed3c54a..2c46b3483e5a9 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.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/firewire/fwphyreg.h,v 1.2.2.1 2005/01/30 00:59:42 imp Exp $
  */
 
 struct phyreg_base {
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 058649fc0cc45..d94f996c82ee5 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.12.2.1 2005/01/30 00:59:42 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 11f3042ff9b00..94004081e3acb 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/iec68113.h,v 1.8.2.1 2005/01/30 00:59:42 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 75fa35660c3f2..60a5a2b554193 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -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/firewire/if_fwe.c,v 1.34.2.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index 805301a1be1eb..b511042b563ae 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.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/firewire/if_fwevar.h,v 1.3.6.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #ifndef _NET_IF_FWEVAR_H_
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 23e812a2e76d3..4febce5d04a1d 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.5.2.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index 0a9ef244752e7..42f09c334a649 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwipvar.h,v 1.2.2.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #ifndef _NET_IF_FWIPVAR_H_
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 658fc351fcae9..a6193949f4746 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.79.2.1 2005/01/30 00:59:42 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 9f85fab38de5a..97af9cb20a536 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.4.2.1 2005/01/30 00:59:42 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index 5267ea3b35323..394bdce21e55a 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -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/firewire/sbp_targ.c,v 1.7.2.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 5add2b6204434..829d2a0b926ac 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.217.2.8 2005/03/13 18:56:08 mux Exp $");
 
 /*
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index b1c8407adabeb..ff1f036c3e5d0 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.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/fxp/if_fxpreg.h,v 1.35.6.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 906fea6cb9a4d..d984313453cc4 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.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/fxp/if_fxpvar.h,v 1.32.2.1 2005/01/30 00:59:42 imp Exp $
  */
 
 /*
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index ec9b99bd33aa9..cb40af0e6b908 100644
--- a/sys/dev/fxp/rcvbundl.h
+++ b/sys/dev/fxp/rcvbundl.h
@@ -29,7 +29,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/fxp/rcvbundl.h,v 1.1.10.1 2005/01/30 00:59:42 imp Exp $
  */
 /*
 rcvbundl.h
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 6ec46bb6afb9b..08bfb3209f6e5 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.27 2004/08/13 23:11:24 rwatson Exp $");
 
 /*
  * Driver for Sun GEM ethernet controllers.
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index 58988900e86ff..c8da7eec40e22 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.16.2.1 2005/01/30 00:59:42 imp Exp $");
 
 /*
  * PCI bindings for Sun GEM ethernet controllers.
diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h
index fecfb152eddd8..bd7b09755de18 100644
--- a/sys/dev/gem/if_gemreg.h
+++ b/sys/dev/gem/if_gemreg.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: gemreg.h,v 1.15 2002/05/11 00:36:02 matt Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gem/if_gemreg.h,v 1.2.8.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #ifndef	_IF_GEMREG_H
diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h
index 07d71e11f02e0..2ab748e80d5d9 100644
--- a/sys/dev/gem/if_gemvar.h
+++ b/sys/dev/gem/if_gemvar.h
@@ -25,7 +25,7 @@
  *
  *	from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.8.6.1 2005/01/30 00:59:42 imp Exp $
  */
 
 #ifndef	_IF_GEMVAR_H
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c
index c58ae0e021e14..0c0a3a493072a 100644
--- a/sys/dev/gfb/gfb_pci.c
+++ b/sys/dev/gfb/gfb_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.13.2.1 2005/01/30 00:59:43 imp Exp $");
 
 #include "opt_fb.h"
 
diff --git a/sys/dev/gfb/gfb_pci.h b/sys/dev/gfb/gfb_pci.h
index 263b3980c5b80..d35e4a3246d23 100644
--- a/sys/dev/gfb/gfb_pci.h
+++ b/sys/dev/gfb/gfb_pci.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gfb/gfb_pci.h,v 1.1.10.1 2005/01/30 00:59:43 imp Exp $
  */
 
 #ifndef _PCI_GFB_H_
diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 7972272255611..08d7fccd31a1f 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.19 2004/05/30 20:08:32 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/gx/if_gxreg.h b/sys/dev/gx/if_gxreg.h
index 4a14a9102b123..efec910c5c20e 100644
--- a/sys/dev/gx/if_gxreg.h
+++ b/sys/dev/gx/if_gxreg.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/gx/if_gxreg.h,v 1.1 2001/10/19 02:17:32 jlemon Exp $
  */
 
 /*
diff --git a/sys/dev/gx/if_gxvar.h b/sys/dev/gx/if_gxvar.h
index 8570a506afa86..a805a20d1c209 100644
--- a/sys/dev/gx/if_gxvar.h
+++ b/sys/dev/gx/if_gxvar.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/gx/if_gxvar.h,v 1.4 2002/11/14 23:54:52 sam Exp $
  */
 
 #if __FreeBSD_version < 500000
diff --git a/sys/dev/harp/if_harp.c b/sys/dev/harp/if_harp.c
index 7a0352036e459..f094ffca7328f 100644
--- a/sys/dev/harp/if_harp.c
+++ b/sys/dev/harp/if_harp.c
@@ -31,10 +31,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.5.2.1 2005/01/30 00:59:43 imp Exp $");
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.5.2.1 2005/01/30 00:59:43 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index cf5b182cfd2f1..af3f6f6a390e8 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.20.2.1 2005/01/30 00:59:43 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index 70bbde89a5318..80a91966773ca 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.16.2.1 2005/01/30 00:59:43 imp Exp $");
 
 /*
  * ForeHE driver.
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index c810279115057..873ecfa1d254c 100644
--- a/sys/dev/hatm/if_hatm_ioctl.c
+++ b/sys/dev/hatm/if_hatm_ioctl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_ioctl.c,v 1.9.4.1 2005/01/30 00:59:43 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index 1b3ee8d437ccb..7000ec076e618 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_rx.c,v 1.7.4.1 2005/01/30 00:59:43 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index b084b9e17ecf1..ea47493731cac 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.9.4.1 2005/01/30 00:59:43 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatmconf.h b/sys/dev/hatm/if_hatmconf.h
index 5402697410d72..154a32f6c826e 100644
--- a/sys/dev/hatm/if_hatmconf.h
+++ b/sys/dev/hatm/if_hatmconf.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmconf.h,v 1.1.4.1 2005/01/30 00:59:43 imp Exp $
  *
  * Default configuration
  */
diff --git a/sys/dev/hatm/if_hatmreg.h b/sys/dev/hatm/if_hatmreg.h
index 9085f07f5a4ba..7c386b4dfbb6e 100644
--- a/sys/dev/hatm/if_hatmreg.h
+++ b/sys/dev/hatm/if_hatmreg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmreg.h,v 1.1.4.1 2005/01/30 00:59:43 imp Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hatm/if_hatmvar.h b/sys/dev/hatm/if_hatmvar.h
index acddaa1e3555f..ec16b5d697283 100644
--- a/sys/dev/hatm/if_hatmvar.h
+++ b/sys/dev/hatm/if_hatmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.15.4.1 2005/01/30 00:59:43 imp Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 8f0a17f58a9c4..cd76727ef3fde 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.5.8.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index 93fbf5d587e26..4766442d542b2 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.4.4.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 491733af197f8..ab94442e395f7 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.15 2004/02/21 19:08:23 harti Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.15 2004/02/21 19:08:23 harti Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index c7e38892e4607..0e9dcd98f6fb5 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.18.2.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.18.2.1 2005/01/30 00:59:43 imp Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 1f68f7d3e44c3..b076e29e4e7f8 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.12 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.12 2003/08/24 17:46:08 obrien Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 51bbd0fb69336..81b4b009f795a 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.12.4.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.12.4.1 2005/01/30 00:59:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index 93062f451f63a..f18727057c428 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.6.8.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index ccaed3f0e0851..ba313c0a9ac46 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.16.2.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.16.2.1 2005/01/30 00:59:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 8454b93f2464f..1153d9640a069 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.11.4.1 2005/01/30 00:59:43 imp Exp $
  *
  */
 
@@ -54,7 +54,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.11.4.1 2005/01/30 00:59:43 imp Exp $");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index d4ab4dd921bab..a92cc4570b482 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.18.2.1 2005/01/30 00:59:44 imp Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.18.2.1 2005/01/30 00:59:44 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index c07eee5e9600e..690269d0b8f59 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.22.2.1 2004/09/15 15:14:17 andre Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.22.2.1 2004/09/15 15:14:17 andre Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 33d73c21dceda..087d20abac047 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.3.8.1 2005/01/30 00:59:44 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index 4126c1f0635cf..37c4c420341a7 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.13.2.1 2005/01/30 00:59:44 imp Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.13.2.1 2005/01/30 00:59:44 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 32095164d8e4b..814702e9d06ff 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.26.1 2005/01/30 00:59:44 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 51745ac9336f6..b8fed778f2917 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.9 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.9 2003/08/24 17:46:08 obrien Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index 84c9adf5c4916..e7b68e54bbe76 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.13 2004/02/22 16:27:28 mux Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.13 2004/02/22 16:27:28 mux Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 57cedb3a761f2..e2ad36323650c 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.10.2.1 2005/01/30 00:59:44 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 95bc6524be999..04eb3974be5c7 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.10.4.1 2005/01/30 00:59:44 imp Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.10.4.1 2005/01/30 00:59:44 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/hfa_eisa.c b/sys/dev/hfa/hfa_eisa.c
index 6c42fb8634e34..d305c5e20e636 100644
--- a/sys/dev/hfa/hfa_eisa.c
+++ b/sys/dev/hfa/hfa_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_eisa.c,v 1.2 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_freebsd.c b/sys/dev/hfa/hfa_freebsd.c
index 34db172bb4cdb..1593deca92bf2 100644
--- a/sys/dev/hfa/hfa_freebsd.c
+++ b/sys/dev/hfa/hfa_freebsd.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/hfa/hfa_freebsd.c,v 1.9 2004/07/15 08:26:01 phk Exp $
  */
 
 /*
diff --git a/sys/dev/hfa/hfa_freebsd.h b/sys/dev/hfa/hfa_freebsd.h
index 75400162eda9a..79e97ee64cdcd 100644
--- a/sys/dev/hfa/hfa_freebsd.h
+++ b/sys/dev/hfa/hfa_freebsd.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/hfa/hfa_freebsd.h,v 1.2 2003/07/31 14:52:44 harti Exp $
  */
 
 struct hfa_softc {
diff --git a/sys/dev/hfa/hfa_pci.c b/sys/dev/hfa/hfa_pci.c
index b6cc311ebd65a..f4e3a3d45cc98 100644
--- a/sys/dev/hfa/hfa_pci.c
+++ b/sys/dev/hfa/hfa_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_pci.c,v 1.4 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index 990803cb19d70..93f69cbb43b23 100644
--- a/sys/dev/hfa/hfa_sbus.c
+++ b/sys/dev/hfa/hfa_sbus.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_sbus.c,v 1.3 2003/08/24 17:46:08 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index a4354949e78fb..4aceacc1f7a8a 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.28.2.3 2005/01/30 00:59:44 imp Exp $");
 
 /*
  * Driver for various Hifn encryption processors.
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index a1022887f2d7c..f3b088179b53a 100644
--- a/sys/dev/hifn/hifn7751reg.h
+++ b/sys/dev/hifn/hifn7751reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.4.2.2 2005/01/30 00:59:44 imp Exp $ */
 /*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h
index 046d204d83147..8013df97c1f26 100644
--- a/sys/dev/hifn/hifn7751var.h
+++ b/sys/dev/hifn/hifn7751var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.4.4.3 2005/01/30 00:59:44 imp Exp $ */
 /*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index 7ac63a62e5e02..5979688053c96 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.31.2.2 2005/02/21 07:41:12 yongari Exp $");
 
 /*
  * HME Ethernet module driver.
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index 929c2868d7cc9..d067940c38cda 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.15.2.3 2005/03/03 00:19:30 marius Exp $");
 
 /*
  * PCI front-end device driver for the HME ethernet device.
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index d2934f42883e2..5a679362b4481 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.14.2.1 2005/02/21 07:28:19 yongari Exp $");
 
 /*
  * SBus front-end device driver for the HME ethernet device.
diff --git a/sys/dev/hme/if_hmereg.h b/sys/dev/hme/if_hmereg.h
index c3d205be0a6f4..9579eddb286a6 100644
--- a/sys/dev/hme/if_hmereg.h
+++ b/sys/dev/hme/if_hmereg.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: hmereg.h,v 1.16 2003/11/02 11:07:45 wiz Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hme/if_hmereg.h,v 1.6 2004/08/05 02:52:33 yongari Exp $
  */
 
 /*
diff --git a/sys/dev/hme/if_hmevar.h b/sys/dev/hme/if_hmevar.h
index fe752b1f6d276..517e35efa25ee 100644
--- a/sys/dev/hme/if_hmevar.h
+++ b/sys/dev/hme/if_hmevar.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: hmevar.h,v 1.5 2000/06/25 01:10:04 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.6.2.1 2005/02/21 07:28:19 yongari Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 1799eea720cdc..6980ffa746bed 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.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/hptmv/entry.c,v 1.2.2.3 2005/03/29 07:24:38 das Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index 3f8d4dd7ae3b8..ccf2c0239f1f6 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.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/hptmv/global.h,v 1.1.2.1 2005/01/30 00:59:44 imp Exp $
  */
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index 9839a67182719..13a49c0de47b4 100644
--- a/sys/dev/hptmv/hptintf.h
+++ b/sys/dev/hptmv/hptintf.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/hptmv/hptintf.h,v 1.1.2.1 2005/01/30 00:59:44 imp Exp $
  */
 
 #ifndef HPT_INTF_H
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index 474b3d5ddb23f..79793acbdd409 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.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/hptmv/mv.c,v 1.1.2.1 2005/01/30 00:59:44 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index 2c0a5f4b1c664..d9d3a185abbb0 100644
--- a/sys/dev/hptmv/mvOs.h
+++ b/sys/dev/hptmv/mvOs.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/hptmv/mvOs.h,v 1.2.2.1 2005/01/30 00:59:44 imp Exp $
  */
 #ifndef __INCmvOsBsdh
 #define __INCmvOsBsdh
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index 5637c44c5e9af..3fa1b0a2ae89c 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.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/hptmv/osbsd.h,v 1.2.2.1 2005/01/30 00:59:44 imp Exp $
  */
 #ifndef _OSBSD_H_
 #define _OSBSD_H_
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index 90672c4ee7e6a..6e3693a02e9cd 100644
--- a/sys/dev/ic/cd1400.h
+++ b/sys/dev/ic/cd1400.h
@@ -27,7 +27,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/ic/cd1400.h,v 1.6 1999/08/28 00:45:12 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ic/cd180.h b/sys/dev/ic/cd180.h
index ae46a4809b688..9d71151007fa4 100644
--- a/sys/dev/ic/cd180.h
+++ b/sys/dev/ic/cd180.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/ic/cd180.h,v 1.4.8.1 2005/01/30 00:59:45 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index b8f903782395b..7b256b5432e9b 100644
--- a/sys/dev/ic/esp.h
+++ b/sys/dev/ic/esp.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/ic/esp.h,v 1.6 2001/06/10 04:20:37 nyan Exp $
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index 3399e0a0de576..f5136f186f8e4 100644
--- a/sys/dev/ic/hd64570.h
+++ b/sys/dev/ic/hd64570.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/ic/hd64570.h,v 1.6.12.1 2005/01/30 00:59:45 imp Exp $
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index 94a2be8fa08c3..e21c84b9c29d5 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8237.h,v 1.8.8.1 2005/03/07 13:10:47 phk Exp $
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i8251.h b/sys/dev/ic/i8251.h
index fab1ea4378696..1f4f844d32e7e 100644
--- a/sys/dev/ic/i8251.h
+++ b/sys/dev/ic/i8251.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/ic/i8251.h,v 1.2 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index d594730a0dd5b..ac6e2af5509cb 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.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/ic/i82586.h,v 1.11 2003/03/28 06:27:07 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i8259.h b/sys/dev/ic/i8259.h
index 91270a0715cc6..53c5194720a2c 100644
--- a/sys/dev/ic/i8259.h
+++ b/sys/dev/ic/i8259.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/ic/i8259.h,v 1.1 2004/01/06 18:59:37 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 1e0561a5ee66e..9137792b010db 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.11 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index cbac72c1e0d4f..22fece01c6410 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.15 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/rsa.h b/sys/dev/ic/rsa.h
index 6f9376af2f233..b6535d05f1bbe 100644
--- a/sys/dev/ic/rsa.h
+++ b/sys/dev/ic/rsa.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/ic/rsa.h,v 1.1 2001/06/10 04:28:38 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ic/wd33c93reg.h b/sys/dev/ic/wd33c93reg.h
index 8e536cd1d32da..a519a838cdce3 100644
--- a/sys/dev/ic/wd33c93reg.h
+++ b/sys/dev/ic/wd33c93reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ic/wd33c93reg.h,v 1.1.10.1 2005/01/30 00:59:45 imp Exp $ */
 /*	$NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $	*/
 /*	$NetBSD$	*/
 /*-
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 2d92a65f9fe57..0ec367aee8a32 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.9.2.1 2005/01/30 00:59:45 imp Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 4432a6db3d3b0..9e61a542adb6d 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.13 2004/06/24 18:21:28 ambrisko Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
diff --git a/sys/dev/ichsmb/ichsmb_reg.h b/sys/dev/ichsmb/ichsmb_reg.h
index a031607f4fdcf..1d138cb65afd1 100644
--- a/sys/dev/ichsmb/ichsmb_reg.h
+++ b/sys/dev/ichsmb/ichsmb_reg.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_reg.h,v 1.1.10.1 2005/01/30 00:59:45 imp Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_REG_H_
diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h
index d8def6de9c481..5208d9d8920f2 100644
--- a/sys/dev/ichsmb/ichsmb_var.h
+++ b/sys/dev/ichsmb/ichsmb_var.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_var.h,v 1.2.8.1 2005/01/30 00:59:45 imp Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_VAR_H
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 893efbd722d4f..2f0693b97588e 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.4.2.1 2005/01/30 00:59:45 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index ef08b2ff7ef52..fd45c1c9cf033 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.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/ichwd/ichwd.h,v 1.1.2.1 2005/01/30 00:59:45 imp Exp $
  */
 
 #ifndef _ICHWD_H_
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 8fc83f46da49c..1be6754918828 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida.c,v 1.36.2.1 2005/02/27 20:55:46 mdodd Exp $");
 
 /*
  * Generic driver for Compaq SMART RAID adapters.
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 794cb90b90c3f..8ae7d043a585e 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.45 2004/05/30 20:08:34 phk Exp $
  */
 
 /*
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index a4f8cd535522f..a29a1fb7877f3 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida_eisa.c,v 1.16.2.1 2005/01/30 00:59:45 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 1053317923316..357077a5b3635 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.29.2.1 2005/02/27 20:55:46 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/idaio.h b/sys/dev/ida/idaio.h
index b30f2eae1ac7a..652833db1df6e 100644
--- a/sys/dev/ida/idaio.h
+++ b/sys/dev/ida/idaio.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idaio.h,v 1.1 2004/01/15 06:37:52 mdodd Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index 2317a3de8813b..360b33beb5e56 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.8 2004/01/15 04:05:47 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 8b5654097767b..c2a5402c5a9b5 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.15.2.1 2005/02/27 20:55:46 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index fbcd9161ab04a..8056c415fd69a 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt.c,v 1.9.2.1 2005/01/30 00:59:46 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idt_harp.c b/sys/dev/idt/idt_harp.c
index 4659c46890373..e4ef1909e2fcb 100644
--- a/sys/dev/idt/idt_harp.c
+++ b/sys/dev/idt/idt_harp.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt_harp.c,v 1.5.2.3 2005/01/30 00:59:46 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c
index 035b68f96f4c5..2d194b27b0c1c 100644
--- a/sys/dev/idt/idt_pci.c
+++ b/sys/dev/idt/idt_pci.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt_pci.c,v 1.4.2.1 2005/01/30 00:59:46 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idtreg.h b/sys/dev/idt/idtreg.h
index 230bbbb1c78c3..e9d4fb1fd6220 100644
--- a/sys/dev/idt/idtreg.h
+++ b/sys/dev/idt/idtreg.h
@@ -37,7 +37,7 @@
  *
  ******************************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/idt/idtreg.h,v 1.1.8.1 2005/01/30 00:59:46 imp Exp $
  */
 
 #define	IDT_VERSION	"IDT 1.101"
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index b98ee1af2dad9..d1c914c508332 100644
--- a/sys/dev/idt/idtvar.h
+++ b/sys/dev/idt/idtvar.h
@@ -47,7 +47,7 @@
  *
  ******************************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/idt/idtvar.h,v 1.2.6.1 2005/01/30 00:59:46 imp Exp $
  */
 
 /*******************************************************************************
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index f30d7752f11f1..1f3f60e8d2251 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.100 2004/08/13 23:15:44 rwatson Exp $");
 
 /*
  * Intel 82586 Ethernet chip
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 7bcc500aa61d2..5eeff15d30471 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.5 2003/03/28 06:27:08 mdodd Exp $
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index b8448c86bcfd8..2b3172d99693f 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie_isa.c,v 1.2 2003/08/24 17:49:13 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ie/if_iee16.h b/sys/dev/ie/if_iee16.h
index 1196676cfed27..4206d6dfa10ab 100644
--- a/sys/dev/ie/if_iee16.h
+++ b/sys/dev/ie/if_iee16.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/ie/if_iee16.h,v 1.3.6.1 2005/01/30 00:59:46 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index d3b0f228f9574..2808fe2bf6f01 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.6 2003/03/29 13:36:41 mdodd Exp $
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/ie/if_ievar.h b/sys/dev/ie/if_ievar.h
index a57b2d0dde20e..d63afe56acd12 100644
--- a/sys/dev/ie/if_ievar.h
+++ b/sys/dev/ie/if_ievar.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ievar.h,v 1.2 2003/08/06 17:28:33 bde Exp $
  */
 
 enum ie_hardware {
diff --git a/sys/dev/ieee488/ibfoo.c b/sys/dev/ieee488/ibfoo.c
index b26e9c8300edb..b90a7b506a2c4 100644
--- a/sys/dev/ieee488/ibfoo.c
+++ b/sys/dev/ieee488/ibfoo.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/ibfoo.c,v 1.5.2.1 2005/03/07 13:46:39 phk Exp $");
 
 #  define	IBDEBUG
 #  undef	IBDEBUG
diff --git a/sys/dev/ieee488/ibfoo_int.h b/sys/dev/ieee488/ibfoo_int.h
index 28f72897a9dfe..0fdaf274aee9c 100644
--- a/sys/dev/ieee488/ibfoo_int.h
+++ b/sys/dev/ieee488/ibfoo_int.h
@@ -26,7 +26,7 @@
  * This file defines the ABI between the userland gpib library and the
  * kernel.  This file should not be used anywhere else.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/ibfoo_int.h,v 1.2.2.1 2005/03/07 13:46:40 phk Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/ieee488/pcii.c b/sys/dev/ieee488/pcii.c
index d575f6927d59a..1ce1524524b9f 100644
--- a/sys/dev/ieee488/pcii.c
+++ b/sys/dev/ieee488/pcii.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/pcii.c,v 1.5.2.1 2005/03/07 13:46:40 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ieee488/ugpib.h b/sys/dev/ieee488/ugpib.h
index 726a70219dd8e..beec58af84437 100644
--- a/sys/dev/ieee488/ugpib.h
+++ b/sys/dev/ieee488/ugpib.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/ieee488/ugpib.h,v 1.5.2.1 2005/03/07 13:46:40 phk Exp $
  *
  */
 
diff --git a/sys/dev/ieee488/upd7210.c b/sys/dev/ieee488/upd7210.c
index d952bc2fa7390..fcb3575bcd1d8 100644
--- a/sys/dev/ieee488/upd7210.c
+++ b/sys/dev/ieee488/upd7210.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.6.2.1 2005/03/07 13:46:40 phk Exp $");
 
 #  define	GPIB_DEBUG
 #  undef	GPIB_DEBUG
diff --git a/sys/dev/ieee488/upd7210.h b/sys/dev/ieee488/upd7210.h
index 7ba0f8eb8d102..d335be7337d23 100644
--- a/sys/dev/ieee488/upd7210.h
+++ b/sys/dev/ieee488/upd7210.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/ieee488/upd7210.h,v 1.3.2.1 2005/03/07 13:46:40 phk Exp $
  *
  * Locating an actual �PD7210 data book has proven quite impossible for me.
  * There are a fair number of newer chips which are supersets of the �PD7210
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index f517989b0e1a4..f6b49b1c4a513 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $");
 
 #include "opt_bdg.h"
 
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 918e89ccbbb5b..2afc8fe8380eb 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.6.2.3 2005/03/31 04:24:36 wpaul Exp $");
 
 #include <sys/ctype.h>
 #include <sys/param.h>
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index 502225b88c675..30dfa5b2874c2 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index a08f14f091598..94d3acb92c656 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.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/if_ndis/if_ndisvar.h,v 1.15.2.2 2005/02/18 16:30:10 wpaul Exp $
  */
 
 #define NDIS_DEFAULT_NODENAME	"FreeBSD NDIS node"
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 1979cf1ed6055..066098c3dbd56 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.21 2004/08/13 23:16:44 rwatson Exp $");
 
 /*
  * I2C bus IP driver
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 3a879d8d0d37d..e7f9f0e877353 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.32 2004/06/16 09:46:45 phk Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 5d362c1a2dd42..8026fcb138dda 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/dev/iicbus/iic.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/iic.h,v 1.3 1999/08/28 00:44:16 peter Exp $
  *
  */
 #ifndef __IIC_H
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 53ecdceb947f1..c2ad09afe6fd5 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.13 2003/08/24 17:49:13 obrien Exp $");
 
 /*
  * Generic I2C bit-banging code
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index 7d10fe748b22d..f48a81213f8f8 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.5.8.1 2005/01/30 00:59:47 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index aae8a76ce51c1..d377e1c70698f 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.20 2004/05/27 13:29:09 joerg Exp $");
 
 /*
  * Autoconfiguration and support routines for the Philips serial I2C bus
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 59bbaef4d3fe2..a97af7f6275fa 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 068cf4d86ff38..2abe6e3145b08 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.5.8.1 2005/01/30 00:59:47 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 6753db9bc49b2..ca85b0d53d12b 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.14 2003/08/24 17:49:13 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 3a9e7e34807f7..971510eec89f4 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.8 2003/06/19 02:50:08 jmg Exp $
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 966063f2a13b2..548c90d97d586 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.12 2003/08/10 14:28:24 ticso Exp $
  *
  */
 
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 60b2962e64fda..68b40bf188680 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.10.2.2 2005/01/30 00:59:47 imp Exp $");
 
 #define _IIR_C_
 
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 830cf087e9c54..96a9f781c4b80 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/iir/iir.h,v 1.10.2.1 2005/01/30 00:59:47 imp Exp $ */
 /*-
  *       Copyright (c) 2000-04 ICP vortex GmbH
  *       Copyright (c) 2002-04 Intel Corporation
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 206b6ffb42081..b3337ec4d7938 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.15.2.1.2.1 2005/05/06 02:34:18 cperciva Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index d0ff7bb4646d0..38b092487f984 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -31,7 +31,7 @@
 
 #ident "$Id: iir_pci.c 1.2 2003/08/26 12:29:55 achim Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.13 2004/03/17 17:50:35 njl Exp $");
 
 /*
  *  iir_pci.c:  PCI Bus Attachment for Intel Integrated RAID Controller driver
diff --git a/sys/dev/io/iodev.c b/sys/dev/io/iodev.c
index 33f6c1d099b9c..92bfed947b8d3 100644
--- a/sys/dev/io/iodev.c
+++ b/sys/dev/io/iodev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/io/iodev.c,v 1.2 2004/08/02 20:42:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c
index 9229857999fd0..c09e2f7eeb952 100644
--- a/sys/dev/ips/ips.c
+++ b/sys/dev/ips/ips.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.13.2.1.2.1 2005/05/06 00:52:14 scottl Exp $");
 
 #include <dev/ips/ips.h>
 #include <sys/stat.h>
diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index 0e5e658336e9a..af7eb3d106eb9 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.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/ips/ips.h,v 1.11.2.1 2005/01/30 22:41:12 scottl Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_commands.c b/sys/dev/ips/ips_commands.c
index bbaed7168bc03..9545b7ab45ab2 100644
--- a/sys/dev/ips/ips_commands.c
+++ b/sys/dev/ips/ips_commands.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.11.2.1 2005/01/30 22:41:12 scottl Exp $");
 
 #include <dev/ips/ips.h>
 
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 7a8f5fd85ac8d..f428d18cd13bd 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_disk.c,v 1.6.2.1 2005/01/30 22:41:12 scottl Exp $");
 
 #include <dev/ips/ips.h>
 #include <dev/ips/ips_disk.h>
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index 0b0fe65d4030a..a662a4dca6436 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.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/ips/ips_disk.h,v 1.3.2.1 2005/01/30 22:41:12 scottl Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_ioctl.c b/sys/dev/ips/ips_ioctl.c
index d3cee20ebdaac..bc963a5925f82 100644
--- a/sys/dev/ips/ips_ioctl.c
+++ b/sys/dev/ips/ips_ioctl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_ioctl.c,v 1.5.2.1 2005/01/30 22:41:12 scottl Exp $");
 
 #include <dev/ips/ips.h>
 #include <dev/ips/ips_ioctl.h>
diff --git a/sys/dev/ips/ips_ioctl.h b/sys/dev/ips/ips_ioctl.h
index ef0691e92846c..5d401460fca37 100644
--- a/sys/dev/ips/ips_ioctl.h
+++ b/sys/dev/ips/ips_ioctl.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/ips/ips_ioctl.h,v 1.1.6.1 2005/01/30 22:41:12 scottl Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index a8de5e4b1240c..17c3a85ed4807 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.10.2.1 2005/01/30 22:41:12 scottl Exp $");
 
 #include <dev/ips/ips.h>
 
diff --git a/sys/dev/isp/DriverManual.txt b/sys/dev/isp/DriverManual.txt
index ea1968f9f8830..fc35af47d07ac 100644
--- a/sys/dev/isp/DriverManual.txt
+++ b/sys/dev/isp/DriverManual.txt
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/DriverManual.txt,v 1.1 2001/10/07 18:26:47 mjacob Exp $ */
 
 		Driver Theory of Operation Manual
 
diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt
index 75f01bf7dd36a..00593d82aa385 100644
--- a/sys/dev/isp/Hardware.txt
+++ b/sys/dev/isp/Hardware.txt
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/Hardware.txt,v 1.2 2003/01/01 18:48:50 schweikh Exp $ */
 
 	Hardware that is Known To or Should Work with This Driver
 
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index d009cd7273ecf..817140ced441a 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.111.2.2 2005/01/30 00:59:47 imp 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 4132b5a0d205f..af8289cc497ba 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.102.2.3 2005/01/30 00:59:47 imp Exp $");
 
 #include <dev/isp/isp_freebsd.h>
 #include <sys/unistd.h>
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 4b1586c1b2954..549a26aca946f 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.75.2.2 2005/01/30 00:59:47 imp Exp $ */
 /*-
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
  * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
diff --git a/sys/dev/isp/isp_inline.h b/sys/dev/isp/isp_inline.h
index e78eb7621c1be..457c896206a10 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.30.2.1 2005/01/30 00:59:47 imp Exp $ */
 /*-
  * Qlogic Host Adapter Inline Functions
  *
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index 921272aa24905..9b5a62645ac1a 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.11.2.1 2005/01/30 00:59:47 imp Exp $ */
 /*-
  * Copyright (c) 2001 by Matthew Jacob
  *
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index be92b963ee194..fa718bc608570 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.98.2.2 2005/01/29 02:42:58 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 5f87f3dbb08e7..4a9f37d676335 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.15 2004/08/12 17:41:29 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index 1d4b397bbad5f..4c5538d5ad59e 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.30.2.2 2005/01/30 00:59:47 imp 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 dff513dd5a1c0..cbc8b3f666eab 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.21.4.2 2005/01/30 00:59:47 imp 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 a2773323d68e1..12cab6b6d5e86 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.9.4.1 2005/01/30 00:59:48 imp 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 4834fd32c79bb..c01c82104d78f 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.46.2.1 2005/01/30 00:59:48 imp 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 163ac9894d90d..e970104ead139 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.22.8.1 2005/01/30 00:59:48 imp 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 b5aa8deed4c11..4ee81bd80345c 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.66.2.2 2005/01/30 00:59:48 imp Exp $ */
 /*-
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/ispfw/asm_1000.h b/sys/dev/ispfw/asm_1000.h
index fb064094d30bf..4912c9f797ed6 100644
--- a/sys/dev/ispfw/asm_1000.h
+++ b/sys/dev/ispfw/asm_1000.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1000.h,v 1.1.8.1 2005/01/30 00:59:48 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1040.h b/sys/dev/ispfw/asm_1040.h
index 9e78a56e5c11a..4cb6bbf46df69 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.3.8.1 2005/01/30 00:59:48 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1080.h b/sys/dev/ispfw/asm_1080.h
index edb0ad711a28a..20ad32468f468 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.2.8.1 2005/01/30 00:59:48 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_12160.h b/sys/dev/ispfw/asm_12160.h
index bc1d42089853f..347c5c252931b 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.5.2.1 2005/01/30 00:59:48 imp 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 399707d575438..124f99a7f7767 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.5.8.1 2005/01/30 00:59:49 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2200.h b/sys/dev/ispfw/asm_2200.h
index 3d92bf7c99e43..e635fd7a637f6 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.6.2.1 2005/01/30 00:59:49 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2300.h b/sys/dev/ispfw/asm_2300.h
index 662bb5b11bdf6..e4795c0a8edac 100644
--- a/sys/dev/ispfw/asm_2300.h
+++ b/sys/dev/ispfw/asm_2300.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2300.h,v 1.6.2.1 2005/01/30 00:59:50 imp Exp $ */
 /*-
  * Copyright (C) 2001, 2002, 2003 by Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index a78570b99576d..d0fd6eeb2bea2 100644
--- a/sys/dev/ispfw/ispfw.c
+++ b/sys/dev/ispfw/ispfw.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.13.2.1 2005/01/29 02:42:14 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ixgb/LICENSE b/sys/dev/ixgb/LICENSE
index 5017645146967..06d98ee75fdb3 100644
--- a/sys/dev/ixgb/LICENSE
+++ b/sys/dev/ixgb/LICENSE
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/LICENSE,v 1.1.4.1 2005/01/30 00:59:52 imp Exp $*/
 /*-
 
 Copyright (c) 2001-2004, Intel Corporation
diff --git a/sys/dev/ixgb/README b/sys/dev/ixgb/README
index 33f85a7c9bd81..f1772771ca562 100644
--- a/sys/dev/ixgb/README
+++ b/sys/dev/ixgb/README
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/README,v 1.1 2004/05/28 00:22:58 tackerman Exp $*/
 FreeBSD Driver for Intel(R) PRO/10GbE Server Adapters
 =====================================================
 
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index a4888e5df0e33..9c3a889649abc 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.3.2.1 2005/03/30 23:08:46 mux Exp $*/
 
 #include <dev/ixgb/if_ixgb.h>
 
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index 7657537765983..bb4d0b901b3cc 100644
--- a/sys/dev/ixgb/if_ixgb.h
+++ b/sys/dev/ixgb/if_ixgb.h
@@ -30,7 +30,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/ixgb/if_ixgb.h,v 1.2.4.1 2005/03/30 23:08:46 mux Exp $*/
 
 #ifndef _IXGB_H_DEFINED_
 #define _IXGB_H_DEFINED_
diff --git a/sys/dev/ixgb/if_ixgb_osdep.h b/sys/dev/ixgb/if_ixgb_osdep.h
index 2024079e6aa20..15db0949b2789 100644
--- a/sys/dev/ixgb/if_ixgb_osdep.h
+++ b/sys/dev/ixgb/if_ixgb_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb_osdep.h,v 1.1.4.1 2005/03/30 23:08:46 mux Exp $*/
 
 #ifndef _FREEBSD_OS_H_
 #define _FREEBSD_OS_H_
diff --git a/sys/dev/ixgb/ixgb_ee.c b/sys/dev/ixgb/ixgb_ee.c
index 861a99a139972..c7ec7b729fb22 100644
--- a/sys/dev/ixgb/ixgb_ee.c
+++ b/sys/dev/ixgb/ixgb_ee.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ee.c,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 #include <dev/ixgb/ixgb_hw.h> 
 #include <dev/ixgb/ixgb_ee.h> 
diff --git a/sys/dev/ixgb/ixgb_ee.h b/sys/dev/ixgb/ixgb_ee.h
index 6a1163aab61bf..d30667aa72e8d 100644
--- a/sys/dev/ixgb/ixgb_ee.h
+++ b/sys/dev/ixgb/ixgb_ee.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ee.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 #ifndef _IXGB_EE_H_
 #define _IXGB_EE_H_
 
diff --git a/sys/dev/ixgb/ixgb_hw.c b/sys/dev/ixgb/ixgb_hw.c
index 23b0b2846e593..131c9d685f79a 100644
--- a/sys/dev/ixgb/ixgb_hw.c
+++ b/sys/dev/ixgb/ixgb_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_hw.c,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 /* ixgb_hw.c
  * Shared functions for accessing and configuring the adapter
diff --git a/sys/dev/ixgb/ixgb_hw.h b/sys/dev/ixgb/ixgb_hw.h
index 2194544e04ee4..88c13bbe55e7f 100644
--- a/sys/dev/ixgb/ixgb_hw.h
+++ b/sys/dev/ixgb/ixgb_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_hw.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 #ifndef _IXGB_HW_H_
 #define _IXGB_HW_H_
 
diff --git a/sys/dev/ixgb/ixgb_ids.h b/sys/dev/ixgb/ixgb_ids.h
index a224f6300fa20..d33ba85719be9 100644
--- a/sys/dev/ixgb/ixgb_ids.h
+++ b/sys/dev/ixgb/ixgb_ids.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ids.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 #ifndef _IXGB_IDS_H_
 #define _IXGB_IDS_H_
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 0568febed341f..dfdae7ae8495b 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy.c,v 1.53 2004/06/16 09:46:48 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joy_isa.c b/sys/dev/joy/joy_isa.c
index efb1e29280dc0..80c54645e40d1 100644
--- a/sys/dev/joy/joy_isa.c
+++ b/sys/dev/joy/joy_isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy_isa.c,v 1.3 2003/08/24 17:49:14 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joy_pccard.c b/sys/dev/joy/joy_pccard.c
index d94819a8c4c2a..cee216eb7209a 100644
--- a/sys/dev/joy/joy_pccard.c
+++ b/sys/dev/joy/joy_pccard.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy_pccard.c,v 1.5 2004/05/27 03:49:42 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joyvar.h b/sys/dev/joy/joyvar.h
index 966fe78abb60e..3a566e0205b84 100644
--- a/sys/dev/joy/joyvar.h
+++ b/sys/dev/joy/joyvar.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/joy/joyvar.h,v 1.3 2004/06/16 09:46:48 phk Exp $
  */
 
 struct joy_softc {
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 1335bc64099b2..f6a954a45e4a0 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/atkbd.c,v 1.43.2.1 2005/01/07 20:36:00 jhb Exp $");
 
 #include "opt_kbd.h"
 #include "opt_atkbd.h"
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index 7fc2325c0dd40..5d570fd1553c3 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.15 2003/08/24 17:49:15 obrien Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index 7711c660863cb..2dba1aa85921a 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.10 2003/07/12 18:36:04 mikeh 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 f60e48c05d942..81b1bac75d50f 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.6.8.1 2005/01/07 20:36:00 jhb Exp $
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index b7694c50d0a4f..f2a9e1b9e7728 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.42 2004/06/16 09:46:48 phk Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 78a5af4208814..63f166a2ec96e 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.17 2004/06/16 09:46:48 phk Exp $
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 2cde0044614e7..abe9228965afd 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.49 2001/03/12 00:00:22 ache Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c
index 07c1c9e236f71..5fde0cd2920af 100644
--- a/sys/dev/led/led.c
+++ b/sys/dev/led/led.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.13 2004/07/10 15:38:27 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/led/led.h b/sys/dev/led/led.h
index 866311b9809a4..0276b5e919426 100644
--- a/sys/dev/led/led.h
+++ b/sys/dev/led/led.h
@@ -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/led/led.h,v 1.5 2004/06/16 09:46:49 phk Exp $
  */
 
 #ifndef _DEV_LED_H
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 6a8ab86f8b77e..af5f8f50a6b49 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.34.2.2 2005/01/30 00:59:52 imp Exp $");
 
 /*
  * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index 7c552b03f2e05..256d1968f5f76 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -30,7 +30,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/lge/if_lgereg.h,v 1.3.8.1 2005/01/30 00:59:53 imp Exp $
  */
 
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 111192dda81bf..8435ddde36b5b 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.110 2004/08/13 23:20:50 rwatson Exp $");
 
 /*
 #define DIAGNOSTIC
diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c
index c52d56ecc3f5e..1889a48ad18ad 100644
--- a/sys/dev/lnc/if_lnc_cbus.c
+++ b/sys/dev/lnc/if_lnc_cbus.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_cbus.c,v 1.7.2.1 2005/01/30 00:59:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c
index f53fd4629fd36..65e135430aef1 100644
--- a/sys/dev/lnc/if_lnc_isa.c
+++ b/sys/dev/lnc/if_lnc_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_isa.c,v 1.18.2.1 2005/01/30 00:59:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 688385ab020b6..49da820c4d6cd 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc_pci.c,v 1.34.2.1 2004/08/25 17:30:36 mux Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/lnc/if_lncreg.h b/sys/dev/lnc/if_lncreg.h
index 86e1d8b021a90..e23d1ec5665a5 100644
--- a/sys/dev/lnc/if_lncreg.h
+++ b/sys/dev/lnc/if_lncreg.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/lnc/if_lncreg.h,v 1.7 2001/07/04 13:00:19 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index 8c76738500f1c..71f93077d5a06 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.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/lnc/if_lncvar.h,v 1.27 2004/03/03 08:33:34 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/mc146818/mc146818.c b/sys/dev/mc146818/mc146818.c
index 4d09193414873..193f083591832 100644
--- a/sys/dev/mc146818/mc146818.c
+++ b/sys/dev/mc146818/mc146818.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mc146818/mc146818.c,v 1.2.2.1 2005/02/17 01:05:09 marius Exp $");
 
 /*
  * mc146818 and compatible time of day chip subroutines
diff --git a/sys/dev/mc146818/mc146818reg.h b/sys/dev/mc146818/mc146818reg.h
index 3aab55f56a5af..3f2ef427a8ff3 100644
--- a/sys/dev/mc146818/mc146818reg.h
+++ b/sys/dev/mc146818/mc146818reg.h
@@ -24,7 +24,7 @@
  *
  *	from: NetBSD: mc146818reg.h,v 1.5 2003/11/02 11:07:45 wiz Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mc146818/mc146818reg.h,v 1.6.2.1 2005/02/17 01:05:09 marius Exp $
  */
 
 /*
diff --git a/sys/dev/mc146818/mc146818var.h b/sys/dev/mc146818/mc146818var.h
index 4e8600cd04e11..e41bfc3cd27bd 100644
--- a/sys/dev/mc146818/mc146818var.h
+++ b/sys/dev/mc146818/mc146818var.h
@@ -25,7 +25,7 @@
  *
  *	from: NetBSD: mc146818var.h,v 1.3 2003/11/24 06:20:40 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mc146818/mc146818var.h,v 1.2.2.1 2005/02/17 01:05:09 marius Exp $
  */
 
 struct mc146818_softc {
diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c
index efa70d29b8a6d..f6e4f89f99dda 100644
--- a/sys/dev/mca/mca_bus.c
+++ b/sys/dev/mca/mca_bus.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mca/mca_bus.c,v 1.13 2003/08/24 17:54:09 obrien Exp $");
 
 /*
  * References:
diff --git a/sys/dev/mca/mca_busreg.h b/sys/dev/mca/mca_busreg.h
index e818b68b80239..6b9324ec4191b 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 db11d67699f60..6555c47f42988 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/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 631983e11f30f..3a266f7056027 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mcd/mcd.c,v 1.142.2.1 2005/01/30 00:59:53 imp Exp $");
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include <sys/param.h>
diff --git a/sys/dev/mcd/mcd_isa.c b/sys/dev/mcd/mcd_isa.c
index f63167246f4d7..279c1614c6599 100644
--- a/sys/dev/mcd/mcd_isa.c
+++ b/sys/dev/mcd/mcd_isa.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mcd/mcd_isa.c,v 1.8 2004/03/17 17:50:36 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 7a255afa04dff..db4fc303c62a8 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mcd/mcdreg.h,v 1.16.2.1 2005/01/30 00:59:53 imp Exp $
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mcd/mcdvar.h b/sys/dev/mcd/mcdvar.h
index adfd4a4f41911..162906369e968 100644
--- a/sys/dev/mcd/mcdvar.h
+++ b/sys/dev/mcd/mcdvar.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mcd/mcdvar.h,v 1.4 2004/06/16 09:46:49 phk Exp $
  */
 
 struct mcd_mbx {
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index d1e62c0b5218e..e5a376a025285 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.127.2.5 2005/02/28 19:32:23 phk Exp $
  *
  */
 
diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c
index 9fb33d2c4d48b..6e8ba71d00de6 100644
--- a/sys/dev/mem/memdev.c
+++ b/sys/dev/mem/memdev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mem/memdev.c,v 1.3 2004/08/04 18:30:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c
index f514f50bedb69..61030b3ef8f4d 100644
--- a/sys/dev/mem/memutil.c
+++ b/sys/dev/mem/memutil.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mem/memutil.c,v 1.1 2004/08/04 18:30:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index aba0b26f9bdf5..436f17c9124ba 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/acphy.c,v 1.15.2.1 2005/01/30 00:59:53 imp Exp $");
 
 /*
  * Driver for Altima AC101 10/100 PHY
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
index 827aba68f157b..0712a62ffd823 100644
--- a/sys/dev/mii/acphyreg.h
+++ b/sys/dev/mii/acphyreg.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/mii/acphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $
  */
 
 #ifndef _DEV_MII_ACPHYREG_H_
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index dac0938ec1ba1..fa80f53006402 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.16.2.1 2005/01/30 00:59:53 imp Exp $");
 
 /*
  * driver for AMD AM79c873 PHYs
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index 6cdbc95647b50..5df0329878817 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.26.1 2005/01/30 00:59:53 imp Exp $
  */
 
 #ifndef _DEV_MII_AMTPHYREG_H_
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index b086c8680ef3a..6de861ce49133 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/bmtphy.c,v 1.8.2.1 2005/01/30 00:59:53 imp Exp $");
 
 /*
  * Driver for the Broadcom BCM5201/BCM5202 "Mini-Theta" PHYs.  This also
diff --git a/sys/dev/mii/bmtphyreg.h b/sys/dev/mii/bmtphyreg.h
index 223d631a54d58..a9b37be791c5a 100644
--- a/sys/dev/mii/bmtphyreg.h
+++ b/sys/dev/mii/bmtphyreg.h
@@ -35,7 +35,7 @@
  *
  *	from NetBSD: bmtphyreg.h,v 1.1 2001/06/02 21:42:10 thorpej Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/bmtphyreg.h,v 1.1.8.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_BMTPHYREG_H_
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 9e62df19ac1ff..34d0273b576ac 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.31.2.2 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index bb9636d882fb4..ab03e472acf52 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.5.4.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_BRGPHYREG_H_
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 86567c0047158..53c9b8bf6a016 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -29,11 +29,11 @@
  * 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/ciphy.c,v 1.1.2.2 2005/01/30 00:59:54 imp Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.1.2.2 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Driver for the Cicada CS8201 10/100/1000 copper PHY.
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index 8c0a8a46cc61c..2cfab10ec0581 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.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/ciphyreg.h,v 1.1.2.2 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_CIPHYREG_H_
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index ddf9b7e2a6058..d1c4a23afcb88 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/dcphy.c,v 1.26.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Pseudo-driver for internal NWAY support on DEC 21143 and workalike
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 7894e95f06bed..9bbbc49503783 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.13.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY.
diff --git a/sys/dev/mii/e1000phyreg.h b/sys/dev/mii/e1000phyreg.h
index 14bf6124e69a6..bc35779f40b8e 100644
--- a/sys/dev/mii/e1000phyreg.h
+++ b/sys/dev/mii/e1000phyreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.2.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Principal Author: Parag Patel
  * Copyright (c) 2001
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index afb90137388b3..64f4749f821df 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.18.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for 3Com internal PHYs
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index b2a3d81686142..29d8341570c89 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.14 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * driver for Intel 82553 and 82555 PHYs
diff --git a/sys/dev/mii/inphyreg.h b/sys/dev/mii/inphyreg.h
index 4b7d1f113051a..c7a9888ced804 100644
--- a/sys/dev/mii/inphyreg.h
+++ b/sys/dev/mii/inphyreg.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/mii/inphyreg.h,v 1.1 2001/03/12 02:41:57 jlemon Exp $
  */
 
 #define MII_INPHY_SCR           0x10    /* status and control register */
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index e4d0c1916748f..165e06b03483d 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.13.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for Level One's LXT-970 ethernet 10/100 PHY
diff --git a/sys/dev/mii/lxtphyreg.h b/sys/dev/mii/lxtphyreg.h
index 662bd34b280e1..efcb0dbf74ccc 100644
--- a/sys/dev/mii/lxtphyreg.h
+++ b/sys/dev/mii/lxtphyreg.h
@@ -1,6 +1,6 @@
 /*	OpenBSD: lxtphyreg.h,v 1.1 1998/11/11 19:34:47 jason Exp 	*/
 /*	NetBSD: lxtphyreg.h,v 1.1 1998/10/24 00:33:17 thorpej Exp 	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/lxtphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index f2b29bc6823c2..38ab6faf93c21 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.20.2.2 2005/03/21 16:05:34 glebius Exp $");
 
 /*
  * MII bus layer, glues MII-capable network interface drivers to sharable
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 0f1a4426e6fe2..f63eb3afc58ef 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.4.8.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 538e5fe547f81..417f9831df008 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mii_physubr.c,v 1.21 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Subroutines common to all PHYs.
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index 017812f4dfb0a..0931059fba7e7 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.4 2001/09/29 18:40:06 jlemon Exp $
 
 #include <sys/bus.h>
 
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 993f261e59108..2ae75f6ce6f77 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.27.4.2 2004/12/15 03:38:06 ps Exp $
 /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
 
 /*-
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index f6c759c40e930..da1d6a5869756 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.15 2002/05/04 11:00:30 phk Exp $
  */
 
 #ifndef _DEV_MII_MIIVAR_H_
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 9b2693314ba59..36197f3d5692b 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mlphy.c,v 1.19.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for Micro Linear 6692 PHYs
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 259739e15a81d..a19f53306c0ea 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.18.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Driver for the National Semiconductor DP83891 and DP83861
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index 44899191715ed..ea6f04fa2678c 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -30,7 +30,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/nsgphyreg.h,v 1.3.8.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_NSGPHYREG_H_
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 05941492947dd..a8a971801eb63 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.22.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for National Semiconductor's DP83840A ethernet 10/100 PHY
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index 5ff0490b1dfe5..5e8d3478e854a 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/pnaphy.c b/sys/dev/mii/pnaphy.c
index 6f3ab65a9deb7..cb9f45b426e22 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.14.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for homePNA PHYs
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 63891f58e5e0c..75d60509a2cbe 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/pnphy.c,v 1.17 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Pseudo-driver for media selection on the Lite-On PNIC 82c168
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 9c92ed8a5de31..1ad5c42421623 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.13.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for Quality Semiconductor's QS6612 ethernet 10/100 PHY
diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h
index a69786596a292..29a32b045a338 100644
--- a/sys/dev/mii/qsphyreg.h
+++ b/sys/dev/mii/qsphyreg.h
@@ -1,6 +1,6 @@
 /*	OpenBSD: qsphyreg.h,v 1.2 1999/03/09 00:02:45 jason Exp 	*/
 /*	NetBSD: qsphyreg.h,v 1.1 1998/08/11 00:01:03 thorpej Exp 	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/qsphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index ad384a93e82e5..06fb29f51ad3a 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.5.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Driver for the RealTek 8169S/8110S internal 10/100/1000 PHY.
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index 0ce44dfcd9aca..2b675692d9f44 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.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/rgephyreg.h,v 1.1.4.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_RGEPHYREG_H_
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index f9c9b5e3102c7..9f050c2621588 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.20.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for RealTek 8139 internal PHYs
diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index 282dcdd344b17..bb593677252bc 100644
--- a/sys/dev/mii/ruephy.c
+++ b/sys/dev/mii/ruephy.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ruephy.c,v 1.4 2004/05/30 17:57:40 phk Exp $");
 
 /*
  * driver for RealTek RTL8150 internal PHY
diff --git a/sys/dev/mii/ruephyreg.h b/sys/dev/mii/ruephyreg.h
index 5f3911bebd5db..4690df15c244d 100644
--- a/sys/dev/mii/ruephyreg.h
+++ b/sys/dev/mii/ruephyreg.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/mii/ruephyreg.h,v 1.1 2003/05/03 10:16:56 akiyama Exp $
  */
 
 #ifndef _RUEPHYREG_H_
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 8ae7b0506d017..834eca6f8449e 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tdkphy.c,v 1.15.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Driver for the TDK 78Q2120 MII
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 4429c9481ec70..994fe7a0f9f43 100644
--- a/sys/dev/mii/tdkphyreg.h
+++ b/sys/dev/mii/tdkphyreg.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/mii/tdkphyreg.h,v 1.1.10.1 2005/01/30 00:59:54 imp Exp $
  */
 
 /*
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index f07e33e16c43d..091a6aea95acc 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.17.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * Driver for Texas Instruments's ThunderLAN PHYs
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index a016f4cc69103..17cd3019846f8 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.26.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_TLPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 2d87b565c2416..1fb776d584db2 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.16.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for generic unknown PHYs
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 123d529131790..7f812399e4b92 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy_subr.c,v 1.8 2004/05/29 18:09:10 marius Exp $");
 
 /*
  * Subroutines shared by the ukphy driver and other PHY drivers.
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index c6d2ee9b383a1..9656368195d67 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.16.2.1 2005/01/30 00:59:54 imp Exp $");
 
 /*
  * driver for the XaQti XMAC II's internal PHY. This is sort of
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 1e828e1681a16..63dea5d844723 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.3.8.1 2005/01/30 00:59:54 imp Exp $
  */
 
 #ifndef _DEV_MII_XMPHYREG_H_
diff --git a/sys/dev/mk48txx/mk48txx.c b/sys/dev/mk48txx/mk48txx.c
index 1cbb5263f6d60..e88fbb9ad4ad6 100644
--- a/sys/dev/mk48txx/mk48txx.c
+++ b/sys/dev/mk48txx/mk48txx.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.3.4.1 2004/09/25 20:53:44 marius Exp $");
 
 /*
  * Mostek MK48T02, MK48T08, MK48T59 time-of-day chip subroutines.
diff --git a/sys/dev/mk48txx/mk48txxreg.h b/sys/dev/mk48txx/mk48txxreg.h
index e2b48868e4a6a..ab6de171b3c72 100644
--- a/sys/dev/mk48txx/mk48txxreg.h
+++ b/sys/dev/mk48txx/mk48txxreg.h
@@ -35,7 +35,7 @@
  *
  *	$NetBSD: mk48txxreg.h,v 1.4 2000/11/11 11:59:42 pk Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txxreg.h,v 1.1.8.1 2004/09/25 20:53:44 marius Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index f026175f91ed0..954497c8bc5ce 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.48 2004/06/16 09:46:50 phk Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx_compat.h b/sys/dev/mlx/mlx_compat.h
index 7160c3d1639bc..176c6439ead91 100644
--- a/sys/dev/mlx/mlx_compat.h
+++ b/sys/dev/mlx/mlx_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/mlx/mlx_compat.h,v 1.3 2003/03/08 08:01:29 phk Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 8b19fa86b154c..fccfd963be07e 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.33 2004/05/30 20:08:36 phk Exp $");
 
 /*
  * Disk driver for Mylex DAC960 RAID adapters.
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index 42b0cc5f6f557..5c7d53a9bb815 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mlx/mlx_pci.c,v 1.19.2.1 2005/03/29 07:24:42 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index f091befad2d0d..43c51cb669666 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.3 2000/04/11 02:52:44 msmith Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index fef77dfbe6f84..d04ae2e9140db 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.8 2002/09/23 18:54:30 alfred Exp $
  */
 
 #define MLX_BLKSIZE	512		/* fixed feature */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 345cf9933c22c..dc9c7e368ae96 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.22 2004/06/16 09:46:50 phk Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 2e368164b6045..06f06ee50a29b 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.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/mly/mly.c,v 1.36 2004/06/16 09:46:51 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 433a1cb1036e0..2f04c87c1f5b3 100644
--- a/sys/dev/mly/mly_tables.h
+++ b/sys/dev/mly/mly_tables.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/mly/mly_tables.h,v 1.3 2002/02/27 23:57:18 peter Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mlyio.h b/sys/dev/mly/mlyio.h
index 504b5040b5327..554544d347fd6 100644
--- a/sys/dev/mly/mlyio.h
+++ b/sys/dev/mly/mlyio.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/mly/mlyio.h,v 1.2 2001/07/14 00:12:22 msmith Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/mly/mlyreg.h b/sys/dev/mly/mlyreg.h
index a4106a57b0039..944998eb9ec81 100644
--- a/sys/dev/mly/mlyreg.h
+++ b/sys/dev/mly/mlyreg.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/mly/mlyreg.h,v 1.2 2002/09/23 18:54:30 alfred Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h
index e1c7a50e91679..58f1a8d016c8b 100644
--- a/sys/dev/mly/mlyvar.h
+++ b/sys/dev/mly/mlyvar.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/mly/mlyvar.h,v 1.6 2004/06/16 09:46:51 phk Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/mpt/mpilib/fc_log.h b/sys/dev/mpt/mpilib/fc_log.h
index fd68bf645931d..a2282f80f4f73 100644
--- a/sys/dev/mpt/mpilib/fc_log.h
+++ b/sys/dev/mpt/mpilib/fc_log.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/fc_log.h,v 1.3.8.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index 1044d8205ca71..1f3929c629e28 100644
--- a/sys/dev/mpt/mpilib/mpi.h
+++ b/sys/dev/mpt/mpilib/mpi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.4.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index 356aee7486961..1a518a37304f0 100644
--- a/sys/dev/mpt/mpilib/mpi_cnfg.h
+++ b/sys/dev/mpt/mpilib/mpi_cnfg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.4.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index 470d385ed5abd..ae28c1f41f280 100644
--- a/sys/dev/mpt/mpilib/mpi_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_fc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.3.8.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index 527b1f9ab7e59..7454b8b98d52f 100644
--- a/sys/dev/mpt/mpilib/mpi_init.h
+++ b/sys/dev/mpt/mpilib/mpi_init.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_init.h,v 1.4.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index a8f8d3e1bc7ea..0b7e75470efac 100644
--- a/sys/dev/mpt/mpilib/mpi_ioc.h
+++ b/sys/dev/mpt/mpilib/mpi_ioc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.4.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index ceaf353a54e7e..36845ec32e6d4 100644
--- a/sys/dev/mpt/mpilib/mpi_lan.h
+++ b/sys/dev/mpt/mpilib/mpi_lan.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_lan.h,v 1.3.8.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index 196f1ba00d6a0..66abc3384c45e 100644
--- a/sys/dev/mpt/mpilib/mpi_raid.h
+++ b/sys/dev/mpt/mpilib/mpi_raid.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_raid.h,v 1.4.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index ba8b2ca7b5538..8a8fff16e04e3 100644
--- a/sys/dev/mpt/mpilib/mpi_targ.h
+++ b/sys/dev/mpt/mpilib/mpi_targ.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_targ.h,v 1.3.8.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index c10cb92bbc8df..656eb65066daf 100644
--- a/sys/dev/mpt/mpilib/mpi_type.h
+++ b/sys/dev/mpt/mpilib/mpi_type.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.4.2.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Copyright (c) 2000, 2001 by LSI Logic Corporation
  *
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index 8c99e1ca319ac..b4a32c3d2884e 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -1,7 +1,7 @@
 /*
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.9 2003/08/24 17:54:11 obrien Exp $");
  * Generic routines for LSI '909 FC  adapters.
  * FreeBSD Version.
  *
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 8161d24125754..2d7043fd74e0c 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.4.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index 96e35e103b3b2..abd8cb8681ed9 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -1,7 +1,7 @@
 /*
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.5 2004/07/13 16:06:19 stefanf Exp $");
  * Debug routines for LSI '909 FC  adapters.
  * FreeBSD Version.
  *
diff --git a/sys/dev/mpt/mpt_freebsd.c b/sys/dev/mpt/mpt_freebsd.c
index 24803db677cd6..ee55d58072838 100644
--- a/sys/dev/mpt/mpt_freebsd.c
+++ b/sys/dev/mpt/mpt_freebsd.c
@@ -1,7 +1,7 @@
 /*
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.15.4.1 2004/08/29 04:56:38 dwhite Exp $");
  * FreeBSD/CAM specific routines for LSI '909 FC  adapters.
  * FreeBSD Version.
  *
diff --git a/sys/dev/mpt/mpt_freebsd.h b/sys/dev/mpt/mpt_freebsd.h
index 49e6f4e0c3714..15e232cc55c48 100644
--- a/sys/dev/mpt/mpt_freebsd.h
+++ b/sys/dev/mpt/mpt_freebsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.h,v 1.9.4.1 2005/01/30 00:59:54 imp Exp $ */
 /*-
  * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index f9054f084b1cf..75074b61355b7 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.16.2.1 2004/12/29 15:46:14 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 62615e57f9417..e92422b21281b 100644
--- a/sys/dev/musycc/musycc.c
+++ b/sys/dev/musycc/musycc.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/musycc/musycc.c,v 1.33.2.1 2004/10/15 21:45:13 jmg Exp $");
 
 /*
  * Card state machine:
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 0c8fa1d5719e6..08effe9a3fb32 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.26 2004/06/09 14:34:01 naddy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/my/if_myreg.h b/sys/dev/my/if_myreg.h
index 9d889d12acef1..3fd963eb0ca92 100644
--- a/sys/dev/my/if_myreg.h
+++ b/sys/dev/my/if_myreg.h
@@ -25,7 +25,7 @@
  *
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/my/if_myreg.h,v 1.1.10.1 2005/01/30 00:59:55 imp Exp $
  *
  * Myson MTD80x register definitions.
  *
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index 346c09aebda8b..946384f1f3f82 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.10.2.1 2005/01/30 00:59:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index fddb9e2fe04d8..69ae6220b08d3 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.22.2.1 2005/01/30 00:59:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/dev/ncv/ncr53c500hw.h b/sys/dev/ncv/ncr53c500hw.h
index 7a4b337b89855..36ec101e38631 100644
--- a/sys/dev/ncv/ncr53c500hw.h
+++ b/sys/dev/ncv/ncr53c500hw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.3.2.1 2005/01/30 00:59:55 imp Exp $	*/
 /*	$NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500hwtab.h b/sys/dev/ncv/ncr53c500hwtab.h
index 47406b1947e42..78b8a2fe78e2c 100644
--- a/sys/dev/ncv/ncr53c500hwtab.h
+++ b/sys/dev/ncv/ncr53c500hwtab.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500hwtab.h,v 1.2.8.1 2005/01/30 00:59:55 imp Exp $	*/
 /*	$NecBSD: ncr53c500hwtab.h,v 1.2.18.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500reg.h b/sys/dev/ncv/ncr53c500reg.h
index 2a9906e44cdf6..8a7f945ccbd3f 100644
--- a/sys/dev/ncv/ncr53c500reg.h
+++ b/sys/dev/ncv/ncr53c500reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500reg.h,v 1.2.8.1 2005/01/30 00:59:55 imp Exp $	*/
 /*	$NecBSD: ncr53c500reg.h,v 1.5.14.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h
index b3aff4660f0d2..f21609e247b4a 100644
--- a/sys/dev/ncv/ncr53c500var.h
+++ b/sys/dev/ncv/ncr53c500var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500var.h,v 1.8.8.1 2005/01/30 00:59:55 imp Exp $	*/
 /*	$NecBSD: ncr53c500var.h,v 1.11.18.1 2001/06/08 06:27:45 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 1958301546be1..74388dac6cc00 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.65.2.3 2005/01/30 00:59:55 imp Exp $");
 
 /*
  * National Semiconductor DP83820/DP83821 gigabit ethernet driver
diff --git a/sys/dev/nge/if_ngereg.h b/sys/dev/nge/if_ngereg.h
index 5a46aa64038ab..dfc770e4fdf2b 100644
--- a/sys/dev/nge/if_ngereg.h
+++ b/sys/dev/nge/if_ngereg.h
@@ -30,7 +30,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/nge/if_ngereg.h,v 1.9.8.2 2005/01/30 00:59:55 imp Exp $
  */
 
 #define NGE_CSR			0x00
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 933f9cb1a9efa..f3ed20ad61d78 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.30.2.1 2005/01/30 00:59:55 imp Exp $");
 
 /*
  * Pseudo-nulmodem driver
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index d955ff2938b27..6341d3bc0f624 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.12.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index 3be1cdbba059e..fca41b6350afa 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.20.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/nsp/nspreg.h b/sys/dev/nsp/nspreg.h
index 81512c91a6099..c8e6178bed0e7 100644
--- a/sys/dev/nsp/nspreg.h
+++ b/sys/dev/nsp/nspreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/nsp/nspreg.h,v 1.2.8.1 2005/01/30 00:59:56 imp Exp $	*/
 /*	$NecBSD: nspreg.h,v 1.4.14.3 2001/06/29 06:27:53 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h
index 59af783ade024..10e4579810a60 100644
--- a/sys/dev/nsp/nspvar.h
+++ b/sys/dev/nsp/nspvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/nsp/nspvar.h,v 1.7.8.1 2005/01/30 00:59:56 imp Exp $	*/
 /*	$NecBSD: nspvar.h,v 1.7.14.5 2001/06/29 06:27:54 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 3fc3ac0b88dc4..87c6df2af26d4 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.30 2004/08/02 19:59:41 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 3f4fbae9754d2..443eccd88d6bd 100644
--- a/sys/dev/ofw/ofw_bus.h
+++ b/sys/dev/ofw/ofw_bus.h
@@ -23,7 +23,7 @@
  * OR TORT (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/ofw/ofw_bus.h,v 1.1 2004/08/12 17:41:29 marius Exp $
  */
 
 #ifndef	_DEV_OFW_OFW_BUS_H_
diff --git a/sys/dev/ofw/ofw_bus_if.m b/sys/dev/ofw/ofw_bus_if.m
index edeee5f655b07..f3d494ad760fc 100644
--- a/sys/dev/ofw/ofw_bus_if.m
+++ b/sys/dev/ofw/ofw_bus_if.m
@@ -23,7 +23,7 @@
 # OR TORT (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/ofw/ofw_bus_if.m,v 1.1.2.1 2005/01/30 00:59:56 imp Exp $
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 12a86541a64fc..5d63bc59bef03 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.28.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_ofw.h"
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 2ba3f594813a8..9136f07e3b652 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.14.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h
index f810be93e4aa3..0df66f20305bc 100644
--- a/sys/dev/ofw/ofw_pci.h
+++ b/sys/dev/ofw/ofw_pci.h
@@ -36,7 +36,7 @@
  *
  *	from: NetBSD: ofw_pci.h,v 1.3 2001/02/16 14:16:30 mrg Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_pci.h,v 1.1 2001/11/18 20:38:43 tmm Exp $
  */
 
 #ifndef _DEV_OFW_OFW_PCI_H_
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index f7ef330597b31..13468fa09731d 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.13.2.1 2005/01/30 00:59:56 imp Exp $");
 /*-
  * Copyright (C) 2000 Benno Rice.
  * All rights reserved.
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index 28b95b3397615..6bc2d6fda481c 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -54,7 +54,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/ofw/openfirm.h,v 1.10.2.1 2005/01/30 00:59:56 imp Exp $
  */
 
 #ifndef _OPENFIRM_H_
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index d9272d1145d31..5ba46ecd85b84 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: openfirmio.c,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.12.2.1 2005/01/30 00:59:56 imp Exp $");
 
 /*-
  * Copyright (c) 1992, 1993
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index bb020262ccbac..730454a6627c4 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -34,7 +34,7 @@
  *
  *	@(#)openpromio.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/openfirmio.h,v 1.4.2.1 2005/01/30 00:59:56 imp Exp $
  */
 
 #ifndef _DEV_OFW_OPENFIRMIO_H_
diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c
index 07a0791515526..d0c0d225a6ed9 100644
--- a/sys/dev/ofw/openpromio.c
+++ b/sys/dev/ofw/openpromio.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openpromio.c,v 1.6 2004/08/16 15:45:26 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/openpromio.h b/sys/dev/ofw/openpromio.h
index 5233d29eb870b..35e6a50d63727 100644
--- a/sys/dev/ofw/openpromio.h
+++ b/sys/dev/ofw/openpromio.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/ofw/openpromio.h,v 1.1 2003/06/19 01:40:11 jake Exp $
  */
 
 #ifndef	_DEV_OFW_OPENPROMIO_H_
diff --git a/sys/dev/owi/if_ieee80211.h b/sys/dev/owi/if_ieee80211.h
index 0e67c58a20f6d..02900369e7ec1 100644
--- a/sys/dev/owi/if_ieee80211.h
+++ b/sys/dev/owi/if_ieee80211.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_ieee80211.h,v 1.5 2000/07/21 04:47:40 onoe Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/owi/if_ieee80211.h,v 1.1 2003/08/24 05:42:48 imp Exp $ */
 
 #ifndef _NET_IF_IEEE80211_H_
 #define _NET_IF_IEEE80211_H_
diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c
index b33da65059cf3..93cafd07f4638 100644
--- a/sys/dev/owi/if_owi.c
+++ b/sys/dev/owi/if_owi.c
@@ -100,7 +100,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.7.2.1 2005/01/30 00:59:56 imp Exp $";
 #endif
 
 static void wi_intr(void *);
diff --git a/sys/dev/owi/if_owi_pccard.c b/sys/dev/owi/if_owi_pccard.c
index 91211e8dd6a4a..07f14e3893204 100644
--- a/sys/dev/owi/if_owi_pccard.c
+++ b/sys/dev/owi/if_owi_pccard.c
@@ -70,7 +70,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/owi/if_owi_pccard.c,v 1.2.2.2 2005/02/02 22:54:17 imp Exp $";
 #endif
 
 static int wi_pccard_probe(device_t);
diff --git a/sys/dev/owi/if_wireg.h b/sys/dev/owi/if_wireg.h
index 697463fffcade..ca7b3c181170a 100644
--- a/sys/dev/owi/if_wireg.h
+++ b/sys/dev/owi/if_wireg.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/owi/if_wireg.h,v 1.1.4.1 2005/01/30 00:59:56 imp Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/owi/if_wivar.h b/sys/dev/owi/if_wivar.h
index a439949e59162..ff3ba94a61de0 100644
--- a/sys/dev/owi/if_wivar.h
+++ b/sys/dev/owi/if_wivar.h
@@ -31,7 +31,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/owi/if_wivar.h,v 1.2.4.1 2005/01/30 00:59:56 imp Exp $
  */
 
 #define WICACHE			/* turn on signal strength cache code */  
diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile
index a46a04bf577e4..8506adf019876 100644
--- a/sys/dev/patm/genrtab/Makefile
+++ b/sys/dev/patm/genrtab/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.4.2.1 2005/02/13 07:23:32 obrien Exp $
 #
 # This program is used to generate the if_patm_rtables.c file
 # for the idt77252 driver. It is not installed.
diff --git a/sys/dev/patm/genrtab/genrtab.c b/sys/dev/patm/genrtab/genrtab.c
index 8d696cfa8ef64..08cd941f8871c 100644
--- a/sys/dev/patm/genrtab/genrtab.c
+++ b/sys/dev/patm/genrtab/genrtab.c
@@ -31,7 +31,7 @@
  * IDT manual.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/genrtab/genrtab.c,v 1.1.4.1 2005/01/30 00:59:57 imp Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -445,7 +445,7 @@ main(int argc, char *argv[])
 	printf(" */\n");
 	printf("\n");
 	printf("#include <sys/cdefs.h>\n");
-	printf("__FBSDID(\"$FreeBSD$\");\n");
+	printf("__FBSDID(\"$FreeBSD: src/sys/dev/patm/genrtab/genrtab.c,v 1.1.4.1 2005/01/30 00:59:57 imp Exp $\");\n");
 	printf("\n");
 	printf("#include <sys/types.h>\n");
 	printf("\n");
diff --git a/sys/dev/patm/idt77252reg.h b/sys/dev/patm/idt77252reg.h
index 13013a2f1056b..8e8a1322d32f4 100644
--- a/sys/dev/patm/idt77252reg.h
+++ b/sys/dev/patm/idt77252reg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/patm/idt77252reg.h,v 1.1.4.1 2005/01/30 00:59:56 imp Exp $
  *
  * Register definitions for the IDT77252 chip.
  */
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index ac01b9586e54b..df953128cae50 100644
--- a/sys/dev/patm/if_patm.c
+++ b/sys/dev/patm/if_patm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm.c,v 1.6.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index f7847250d2ae0..24311214aa77b 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_attach.c,v 1.7.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_intr.c b/sys/dev/patm/if_patm_intr.c
index f17725395d857..d322fa56868d2 100644
--- a/sys/dev/patm/if_patm_intr.c
+++ b/sys/dev/patm/if_patm_intr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_intr.c,v 1.3.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_ioctl.c b/sys/dev/patm/if_patm_ioctl.c
index 6dc669d99ff3d..ccb985b571e5c 100644
--- a/sys/dev/patm/if_patm_ioctl.c
+++ b/sys/dev/patm/if_patm_ioctl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_ioctl.c,v 1.7.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_rtables.c b/sys/dev/patm/if_patm_rtables.c
index f945276690b4b..410b25ac9fba2 100644
--- a/sys/dev/patm/if_patm_rtables.c
+++ b/sys/dev/patm/if_patm_rtables.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rtables.c,v 1.3 2004/03/10 17:03:27 bms Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index 01c32435fb7fc..6402df6774713 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.5.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index 0c6a99e185a93..c3ff5dc6f0359 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_tx.c,v 1.6.2.1 2005/01/30 00:59:56 imp Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patmvar.h b/sys/dev/patm/if_patmvar.h
index 5cadbc3522da8..658125b2c0a67 100644
--- a/sys/dev/patm/if_patmvar.h
+++ b/sys/dev/patm/if_patmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/patm/if_patmvar.h,v 1.3.4.1 2005/01/30 00:59:56 imp Exp $
  *
  * Driver for IDT77252 (ABR) based cards like ProSum's.
  */
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index d5f34122ace0f..ea30c4a559330 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.24.2.2 2005/02/03 00:30:02 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 00a9015c170d8..bede7c9540087 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.93.2.2 2005/02/03 00:30:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index 4286208460c91..b7b7b28c404db 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.17 2000/02/10 09:01:52 chopps Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.c,v 1.28.2.2 2005/02/03 00:30:02 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h
index 2db306416920c..b1163aa911cca 100644
--- a/sys/dev/pccard/pccard_cis.h
+++ b/sys/dev/pccard/pccard_cis.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.h,v 1.1.4.2 2005/02/03 00:30:02 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 e465e381c7417..111d773ee98ed 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.13.2.1 2005/01/30 00:59:57 imp Exp $");
 
 #define	PCCARDDEBUG
 
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 9e6127a4bde61..ab67bc04eda9d 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.85.2.3 2005/02/02 22:50:03 imp Exp $
 /* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */
 /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
 
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index e0f6647771bce..6eef85b7d0940 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.2.4.1 2005/01/30 00:59:57 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 37835e2bbebb0..9ff5328b6d2a5 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.47.2.1 2005/01/30 00:59:57 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 a85fd01e50e00..9d2ddcce8c9d4 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.3.8.1 2005/01/30 00:59:57 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 2633ac77d2822..bd200c9ea0123 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.117.2.2 2005/02/03 00:32:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index 13025a615d2a0..ae2365fe25a82 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_isa.c,v 1.2.2.1 2005/01/30 00:59:57 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index b5e9c07422761..ab8ef2f03b1fc 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.2.2.2 2005/02/03 00:32:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index 6db43829cde06..d85d394c7bba8 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbdevid.h,v 1.16.2.2 2005/02/03 00:32:01 imp Exp $
  */
 
 /* Vendor/Device IDs */
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index 4b33c873f1775..1e5697f856d60 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.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/pccbb/pccbbreg.h,v 1.14.4.1 2005/01/30 00:59:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 455f7643efd21..c4da8bb2bcfa4 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.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/pccbb/pccbbvar.h,v 1.21.2.1 2005/01/30 00:59:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 7b5f0649a6d83..27d74ac459a63 100644
--- a/sys/dev/pcf/envctrl.c
+++ b/sys/dev/pcf/envctrl.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.4 2004/08/12 17:41:30 marius Exp $");
 
 /*
  * Device specific driver for the SUNW,envctrl device found on some
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 032095855f59c..862185850c699 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.25 2004/05/31 14:24:21 nsouch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c
index b23c8dd5b5b8f..dfd907d48f60c 100644
--- a/sys/dev/pcf/pcf_ebus.c
+++ b/sys/dev/pcf/pcf_ebus.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.3 2004/08/12 17:41:30 marius Exp $");
 
 /*
  * Device specific driver for the EBus i2c devices found on some sun4u
diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c
index a4a2a5099f530..1d48651fe31c1 100644
--- a/sys/dev/pcf/pcf_isa.c
+++ b/sys/dev/pcf/pcf_isa.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.5 2004/08/11 21:19:31 marius Exp $");
 
 /*
  * Hardware driver for a Philips PCF8584 I2C bus controller sitting
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index ed4d9d8cb9a9a..c000ec10aeee1 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.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/pcf/pcfvar.h,v 1.3 2004/08/11 21:19:31 marius Exp $
  */
 
 #define IO_PCFSIZE	2
diff --git a/sys/dev/pci/eisa_pci.c b/sys/dev/pci/eisa_pci.c
index 61027a1cbc678..092438551210b 100644
--- a/sys/dev/pci/eisa_pci.c
+++ b/sys/dev/pci/eisa_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/eisa_pci.c,v 1.6 2004/05/30 20:08:37 phk Exp $");
 
 /*
  * PCI:EISA bridge support
diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
index 56e6df59e68f3..b896d388f4802 100644
--- a/sys/dev/pci/fixup_pci.c
+++ b/sys/dev/pci/fixup_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/fixup_pci.c,v 1.6 2004/05/30 17:57:41 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 1ae9d34545c11..0445c6490da30 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/sys/dev/pci/ignore_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/ignore_pci.c,v 1.4 2004/05/30 17:57:41 phk Exp $");
 
 /*
  * 'Ignore' driver - eats devices that show up errnoeously on PCI
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index 335f1a5a9f234..8a40aba083bb3 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/sys/dev/pci/isa_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/isa_pci.c,v 1.12 2004/05/30 17:57:42 phk Exp $");
 
 /*
  * PCI:ISA bridge support
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index ea8642835685c..4dc56b6ddaf8b 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.264.2.9 2005/04/01 22:53:42 jmg Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index 107746b25f0a7..a4e254d613724 100644
--- a/sys/dev/pci/pci_if.m
+++ b/sys/dev/pci/pci_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/pci/pci_if.m,v 1.6.4.1 2005/01/30 00:59:58 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 43114d7741991..534dd2f8e702a 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.33 2004/07/01 07:46:28 jhb Exp $");
 
 /*
  * PCI:PCI bridge support.
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index fdeeaaab2baef..2e5b0e1548955 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.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/pci/pci_private.h,v 1.12.2.1 2005/01/30 00:59:58 imp Exp $
  *
  */
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index b14abe13b3fb2..0efb8abddab90 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.17 2004/06/16 09:46:53 phk Exp $");
 
 #include "opt_bus.h"	/* XXX trim includes */
 
diff --git a/sys/dev/pci/pcib_if.m b/sys/dev/pci/pcib_if.m
index c9f480e701a31..83ca6df460404 100644
--- a/sys/dev/pci/pcib_if.m
+++ b/sys/dev/pci/pcib_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/pci/pcib_if.m,v 1.4.8.1 2005/01/30 00:59:58 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h
index a4acaabe13a98..344f8d143eb3f 100644
--- a/sys/dev/pci/pcib_private.h
+++ b/sys/dev/pci/pcib_private.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/pci/pcib_private.h,v 1.6 2004/01/11 06:52:31 imp Exp $
  */
 
 #ifndef __PCIB_PRIVATE_H__
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 466cddaa55d67..f661bc4e70aaa 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.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/pci/pcireg.h,v 1.39.4.3 2005/04/02 05:03:34 jmg Exp $
  *
  */
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 75bc8d3f9e4dd..c251ff85eea2b 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.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/pci/pcivar.h,v 1.64.2.1 2005/01/30 00:59:58 imp Exp $
  *
  */
 
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index ea01423945c0d..c0cd826b31733 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.27 2004/03/17 17:50:39 njl Exp $
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index e8082f51e0561..342d93efa4e13 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.22 2004/03/17 17:50:39 njl Exp $");
 
 /*
  * DEC PDQ FDDI Controller; code for BSD derived operating systems
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 9fb29ad3cdf82..42622e506d64b 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq.c,v 1.9.4.1 2005/01/30 00:59:58 imp Exp $");
 
 /*
  * DEC PDQ FDDI Controller O/S independent code
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index ba2a993faf9ea..935453e888c79 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.8 2004/06/13 17:29:07 mlaier Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 311b26d600ed8..a359ef70ef043 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.23 2003/08/24 17:54:16 obrien Exp $");
 
 /*
  * DEC PDQ FDDI Controller; code for BSD derived operating systems
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index 95781957e1a04..c52f7e50ed426 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqreg.h,v 1.11 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqreg.h,v 1.4 2002/03/29 11:22:19 mdodd Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 282d79e460b15..be11ad66f4573 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.11 2004/01/13 20:36:03 alc Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 5b05812ed551f..9a213da91ed28 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.35.2.1 2004/09/15 15:14:18 andre Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 7bb9ad4639293..2efdead5dcb1f 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/immio.c,v 1.17 2003/08/24 17:54:16 obrien Exp $");
 
 /*
  * Iomega ZIP+ Matchmaker Parallel Port Interface driver
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index a9b3667c41291..21e80e6ca6b3d 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpbb.c,v 1.18 2004/03/18 21:10:11 guido Exp $");
 
 /*
  * I2C Bit-Banging over parallel port
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 251f56e594fb7..99dd2819733d6 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.34.2.1 2005/01/30 00:59:58 imp Exp $");
 
 /*
  * Device Driver for AT parallel printer port
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 9075b4ec6e5ad..da1a527ee5b85 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 e8471d396d20e..6619aa41afbe5 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.10.1 2005/01/30 00:59:58 imp Exp $
  */
 
 #ifndef	_DEV_PPBUS_LPT_H_
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 0a650552aecea..4fec111008fe2 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pcfclock.c,v 1.19.2.1 2005/01/30 00:59:58 imp Exp $");
 
 #include "opt_pcfclock.h"
 
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 566350301cbee..96121cc88def8 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_1284.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 
 /*
  * General purpose routines for the IEEE1284-1994 Standard
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index 5c4010f88bf52..39657494dd7c6 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 f54dae1e44ec8..117ad8615ff74 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 533ab5f4603a5..553babad0c24f 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_msq.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 #include <machine/stdarg.h>
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 1ee55e56d4bfa..59dc74a6a922f 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.9 2002/11/09 12:55:05 alfred Exp $
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 1ad27f8febd31..37eda7fd2e535 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.23 2003/08/24 17:54:16 obrien Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index eb1f64ec68aef..07f11b39b5a4b 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.19 2003/08/07 15:04:25 jhb Exp $
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppbio.h b/sys/dev/ppbus/ppbio.h
index 2794eddc1dea3..b288fc892ed57 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 ccc308d23f367..c0b6da162ab2d 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.2.8.1 2005/01/30 00:59:58 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 77a8f8f4c2ac8..cb68a017dc3f3 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.38 2004/07/09 16:56:46 cognet Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 8ff2fb48c4ad6..e5b9994cdbce7 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 bf7c08b41ece4..23255ee4fdb3f 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pps.c,v 1.43.2.1 2005/01/30 00:59:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index f01c0d12791b3..0ea267dbd2ab2 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.33 2004/07/09 16:56:46 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 128fdc7e56f01..33159ab20d189 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpoio.c,v 1.18 2003/08/24 17:54:16 obrien Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index fe66fa5299be7..64d2ccbe76376 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.5 2001/01/02 21:29:06 nsouch Exp $
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 05952263588a8..51672a2590fb5 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.44 2004/05/30 20:08:37 phk Exp $");
 
 #include "opt_ppc.h"
 
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index 2b41bfebca1d2..1f97c4ea0c248 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.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/ppc/ppc_puc.c,v 1.2 2004/05/30 20:08:37 phk Exp $
  *
  */
 
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index ea12ead9c417a..96a29cac5ee84 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.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/ppc/ppcreg.h,v 1.15 2001/06/23 06:52:54 nsouch Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index 9bef9080aa7ac..c73a09d0a2da2 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.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/ppc/ppcvar.h,v 1.1.4.1 2005/01/30 00:59:58 imp Exp $
  *
  */
 
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index a9c47e830ac2e..c60e9dde25e59 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.6 2003/08/24 17:54:17 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pst/pst-iop.h b/sys/dev/pst/pst-iop.h
index 57f050411bc33..090b9a0c88951 100644
--- a/sys/dev/pst/pst-iop.h
+++ b/sys/dev/pst/pst-iop.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/pst/pst-iop.h,v 1.4.6.1 2004/10/02 14:14:27 scottl Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index 9d97280ee62d3..564c0cd96c0dd 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/sys/dev/pst/pst-pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.6.2.1 2004/10/02 14:14:27 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index f14be91904d21..7b0bf8e7520e3 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.13.2.1 2004/10/02 14:14:27 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 07e210f8cbf86..081929e4ae6b7 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.33.2.2 2005/03/01 14:20:08 marius Exp $");
 
 /*
  * PCI "universal" communication card device driver, glues com, lpt,
diff --git a/sys/dev/puc/puc_ebus.c b/sys/dev/puc/puc_ebus.c
index 12ac8766c8b8d..fd00fb0775112 100644
--- a/sys/dev/puc/puc_ebus.c
+++ b/sys/dev/puc/puc_ebus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.3.2.1 2005/01/30 00:59:59 imp Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index c01db42e6537e..e9bb3d05b213a 100644
--- a/sys/dev/puc/puc_pccard.c
+++ b/sys/dev/puc/puc_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.9 2004/05/30 20:08:38 phk Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index 7d876de81e608..efe0f1be22f18 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.10.2.1 2005/01/30 00:59:59 imp Exp $");
 
 /*-
  * Copyright (c) 1996, 1998, 1999
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.10.2.1 2005/01/30 00:59:59 imp Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/puc_sbus.c b/sys/dev/puc/puc_sbus.c
index 8bd36d0c4387c..e3f930be01ee2 100644
--- a/sys/dev/puc/puc_sbus.c
+++ b/sys/dev/puc/puc_sbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.4.2.4 2005/03/01 14:20:15 marius Exp $");
 
 #include "opt_puc.h"
 
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index e8b05a96179a6..c622a3ce58019 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.45.2.4 2005/02/17 19:55:15 wilko Exp $");
 
 /*
  * PCI "universal" communications card driver configuration data (used to
diff --git a/sys/dev/puc/pucvar.h b/sys/dev/puc/pucvar.h
index bf9bb7f4f5d0b..b8506a820d74e 100644
--- a/sys/dev/puc/pucvar.h
+++ b/sys/dev/puc/pucvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/puc/pucvar.h,v 1.13.2.1 2005/01/30 00:59:59 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 JF Hay.  All rights reserved.
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index 0ffa83eff0341..e5bf483a4517d 100644
--- a/sys/dev/random/harvest.c
+++ b/sys/dev/random/harvest.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/harvest.c,v 1.24 2004/04/16 17:07:11 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/kthread.h>
diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 95fc8e9436892..cd49870d2969a 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/hash.c,v 1.12 2004/04/09 15:47:09 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h
index 8580d145d6832..9c31976bc8f8b 100644
--- a/sys/dev/random/hash.h
+++ b/sys/dev/random/hash.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/random/hash.h,v 1.5 2004/04/09 15:47:09 markm Exp $
  */
 
 #define KEYSIZE		32		/* (in bytes) 32 bytes == 256 bits */
diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c
index c0dba9e5da837..4c849c7163d60 100644
--- a/sys/dev/random/nehemiah.c
+++ b/sys/dev/random/nehemiah.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/nehemiah.c,v 1.2 2004/04/17 19:26:53 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/dev/random/nehemiah.h b/sys/dev/random/nehemiah.h
index b35fb3fb2262f..90af99b159d01 100644
--- a/sys/dev/random/nehemiah.h
+++ b/sys/dev/random/nehemiah.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/random/nehemiah.h,v 1.1 2004/04/09 15:47:09 markm Exp $
  */
 
 extern struct random_systat random_nehemiah;
diff --git a/sys/dev/random/probe.c b/sys/dev/random/probe.c
index 05b8223246781..849630ca0e2c0 100644
--- a/sys/dev/random/probe.c
+++ b/sys/dev/random/probe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/probe.c,v 1.2.2.1 2005/02/12 17:48:01 iedowse Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 79dbe5fe86a4d..c3f2b6b9fb229 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/randomdev.c,v 1.58 2004/08/02 20:42:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h
index bf13e1b8568bf..e0ed94a31ff05 100644
--- a/sys/dev/random/randomdev.h
+++ b/sys/dev/random/randomdev.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/random/randomdev.h,v 1.6 2004/04/16 17:10:54 markm Exp $
  */
 
 /* This header contains only those definitions that are global
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index ae22046925b03..f657769f95144 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.44 2004/04/09 15:47:09 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/random/yarrow.h b/sys/dev/random/yarrow.h
index 558354d27f737..098065fdc5992 100644
--- a/sys/dev/random/yarrow.h
+++ b/sys/dev/random/yarrow.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/random/yarrow.h,v 1.18 2004/04/09 15:47:09 markm Exp $
  */
 
 /* This contains Yarrow-specific declarations.
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 04e6c074b667d..656ccc298491b 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ray/if_ray.c,v 1.72.2.1 2005/01/30 00:59:59 imp Exp $");
 
 /*	$NetBSD: if_ray.c,v 1.12 2000/02/07 09:36:27 augustss Exp $	*/
 /* 
diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
index 4981da6b85fe4..e47d0bcd5a2d7 100644
--- a/sys/dev/ray/if_raydbg.h
+++ b/sys/dev/ray/if_raydbg.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/ray/if_raydbg.h,v 1.12.8.1 2005/01/30 00:59:59 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_raymib.h b/sys/dev/ray/if_raymib.h
index de3bb16411316..b651c2e5523b0 100644
--- a/sys/dev/ray/if_raymib.h
+++ b/sys/dev/ray/if_raymib.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/ray/if_raymib.h,v 1.12.8.1 2005/01/30 00:59:59 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayreg.h b/sys/dev/ray/if_rayreg.h
index 562279f7aa3df..2a899684e08b0 100644
--- a/sys/dev/ray/if_rayreg.h
+++ b/sys/dev/ray/if_rayreg.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/ray/if_rayreg.h,v 1.10.10.1 2005/01/30 00:59:59 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index 1cb9b969f1b7b..0d38a93b069d2 100644
--- a/sys/dev/ray/if_rayvar.h
+++ b/sys/dev/ray/if_rayvar.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/ray/if_rayvar.h,v 1.17.8.1 2005/01/30 00:59:59 imp Exp $
  *
  */
 
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 3e51c7b7d8c94..c244ea25f9163 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.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/rc/rc.c,v 1.97.2.1 2005/01/30 00:59:59 imp Exp $
  */
 
 /*
diff --git a/sys/dev/rc/rcreg.h b/sys/dev/rc/rcreg.h
index 8ba287e7251c0..9e40c4a855c36 100644
--- a/sys/dev/rc/rcreg.h
+++ b/sys/dev/rc/rcreg.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/rc/rcreg.h,v 1.5.8.1 2005/01/30 00:59:59 imp Exp $
  */
 
 /*
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index d0c9b056d4d71..bd3be41f79140 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.28.2.11 2005/03/31 17:38:39 cognet Exp $");
 
 /*
  * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 15ddcceeb59c6..6ae8f5c5feaf8 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rndtest/rndtest.c,v 1.4.4.1 2005/01/30 01:00:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 5a284e9a91de5..a263f5299d426 100644
--- a/sys/dev/rndtest/rndtest.h
+++ b/sys/dev/rndtest/rndtest.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.1.8.1 2005/01/30 01:00:00 imp Exp $	*/
 /*	$OpenBSD$	*/
 
 /*-
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index ceb22adcbb83f..7e4837f9cff92 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.64.2.1 2005/01/30 01:00:00 imp Exp $");
 
 /* 
  * rp.c - for RocketPort FreeBSD
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index ebefe4f8b3adf..828cb96a0e31c 100644
--- a/sys/dev/rp/rp_isa.c
+++ b/sys/dev/rp/rp_isa.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp_isa.c,v 1.6.2.1 2005/01/30 01:00:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index 70aaa5b9d3ff0..2d0fceadbbb11 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/sys/dev/rp/rp_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.9 2004/06/21 13:02:25 gallatin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rpreg.h b/sys/dev/rp/rpreg.h
index 7ab041d3ccb8f..80a0af63a3871 100644
--- a/sys/dev/rp/rpreg.h
+++ b/sys/dev/rp/rpreg.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/rp/rpreg.h,v 1.6.2.1 2005/01/30 01:00:00 imp Exp $
  */
 
 /*
diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h
index d0a9427618fb4..263854ca9eef2 100644
--- a/sys/dev/rp/rpvar.h
+++ b/sys/dev/rp/rpvar.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/rp/rpvar.h,v 1.6.2.1 2005/01/30 01:00:00 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index c6dfc2246fd63..19ac31e4dac0f 100644
--- a/sys/dev/sab/sab.c
+++ b/sys/dev/sab/sab.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.35.2.1 2005/01/30 01:00:00 imp Exp $");
 
 /*
  * SAB82532 Dual UART driver
diff --git a/sys/dev/sab/sab82532reg.h b/sys/dev/sab/sab82532reg.h
index 77e48216357f0..a191df7870cf4 100644
--- a/sys/dev/sab/sab82532reg.h
+++ b/sys/dev/sab/sab82532reg.h
@@ -34,7 +34,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sab/sab82532reg.h,v 1.1.8.1 2005/01/30 01:00:00 imp Exp $
  */
 
 /*
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 828d67d78a4d1..64f99dd33f67b 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.7 2004/05/30 20:08:40 phk Exp $");
 
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
diff --git a/sys/dev/safe/safereg.h b/sys/dev/safe/safereg.h
index 6d07999eb10e3..c38c3d203acdc 100644
--- a/sys/dev/safe/safereg.h
+++ b/sys/dev/safe/safereg.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/safe/safereg.h,v 1.1 2003/07/21 21:46:07 sam Exp $
  */
 #ifndef _SAFE_SAFEREG_H_
 #define	_SAFE_SAFEREG_H_
diff --git a/sys/dev/safe/safevar.h b/sys/dev/safe/safevar.h
index fd1ee389a2a78..d9f1202399754 100644
--- a/sys/dev/safe/safevar.h
+++ b/sys/dev/safe/safevar.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/safe/safevar.h,v 1.1 2003/07/21 21:46:07 sam Exp $
  */
 #ifndef _SAFE_SAFEVAR_H_
 #define	_SAFE_SAFEVAR_H_
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index c5228b318484c..5a781c4b5e787 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.18.2.1 2005/01/30 01:00:01 imp Exp $");
 
 /*
  * Device driver for Granch SBNI12 leased line adapters
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index 956882aeaf996..0dab08da8f39b 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.12.2.1 2005/01/30 01:00:01 imp Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
index 92e864e9c4a7f..afda60d0d692a 100644
--- a/sys/dev/sbni/if_sbni_pci.c
+++ b/sys/dev/sbni/if_sbni_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.11 2004/03/17 17:50:41 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sbni/if_sbnireg.h b/sys/dev/sbni/if_sbnireg.h
index 4fec30c62f1fb..928f45fc28fd6 100644
--- a/sys/dev/sbni/if_sbnireg.h
+++ b/sys/dev/sbni/if_sbnireg.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/sbni/if_sbnireg.h,v 1.1.10.1 2005/01/30 01:00:01 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
index 0fe2f09568b90..4505692cc2569 100644
--- a/sys/dev/sbni/if_sbnivar.h
+++ b/sys/dev/sbni/if_sbnivar.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/sbni/if_sbnivar.h,v 1.3.8.1 2005/01/30 01:00:01 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 19292b1d3013d..4674b6cbfb8b3 100644
--- a/sys/dev/sbsh/if_sbsh.c
+++ b/sys/dev/sbsh/if_sbsh.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.10 2004/05/30 20:08:40 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sbsh/if_sbshreg.h b/sys/dev/sbsh/if_sbshreg.h
index 94cb0aac46c92..ae01aadda7f8c 100644
--- a/sys/dev/sbsh/if_sbshreg.h
+++ b/sys/dev/sbsh/if_sbshreg.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/sbsh/if_sbshreg.h,v 1.1.8.1 2005/01/30 01:00:01 imp Exp $
  */
 
 /* SBNI16 controller chip definitions */
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index e474a8a07e283..86ee51a1d3913 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scd/scd.c,v 1.82 2004/07/28 06:20:57 kan Exp $");
 
 
 #undef	SCD_DEBUG
diff --git a/sys/dev/scd/scd_isa.c b/sys/dev/scd/scd_isa.c
index da2fe6a0d5eb9..17b48f0f61922 100644
--- a/sys/dev/scd/scd_isa.c
+++ b/sys/dev/scd/scd_isa.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scd/scd_isa.c,v 1.4 2004/03/17 17:50:41 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index 38e2293bc7d8a..844d5b4d6b2cd 100644
--- a/sys/dev/scd/scdreg.h
+++ b/sys/dev/scd/scdreg.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/scd/scdreg.h,v 1.7 2004/03/12 21:45:28 trhodes Exp $
  *
  */
 
diff --git a/sys/dev/scd/scdvar.h b/sys/dev/scd/scdvar.h
index 773a78be1fb65..e94e20cba6238 100644
--- a/sys/dev/scd/scdvar.h
+++ b/sys/dev/scd/scdvar.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/scd/scdvar.h,v 1.3 2004/06/16 09:46:55 phk Exp $
  */
 
 struct scd_mbx {
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 409bb8db98812..b5f98e121970d 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si.c,v 1.132.2.1 2005/01/30 01:00:01 imp Exp $");
 
 #ifndef lint
 static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International, 1990,1992,1998",
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index 11a653ad909a1..79a544551634d 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.18.2.1 2005/01/30 01:00:01 imp Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/si2_z280.c b/sys/dev/si/si2_z280.c
index 6caaf3d577a38..6b9af95fa0856 100644
--- a/sys/dev/si/si2_z280.c
+++ b/sys/dev/si/si2_z280.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si2_z280.c,v 1.5.4.1 2005/01/30 01:00:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/si/si3_t225.c b/sys/dev/si/si3_t225.c
index 17980075a6589..f700d6f3d0d05 100644
--- a/sys/dev/si/si3_t225.c
+++ b/sys/dev/si/si3_t225.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si3_t225.c,v 1.7.4.1 2005/01/30 01:00:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c
index edb0a8ef03598..c20eb2f206a47 100644
--- a/sys/dev/si/si_eisa.c
+++ b/sys/dev/si/si_eisa.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_eisa.c,v 1.5.2.1 2005/01/30 01:00:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c
index 5758a8391d4be..e90485728324a 100644
--- a/sys/dev/si/si_isa.c
+++ b/sys/dev/si/si_isa.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_isa.c,v 1.6.2.1 2005/01/30 01:00:01 imp Exp $");
 
 #include "opt_debug_si.h"
 
diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c
index f6e2486b9f720..24c3b0d44a4ed 100644
--- a/sys/dev/si/si_pci.c
+++ b/sys/dev/si/si_pci.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.6 2004/05/30 20:08:40 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 4b4ef6ad6063f..c414621de639d 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.26.1 2005/01/30 01:00:01 imp Exp $
  */
 
 /*
diff --git a/sys/dev/si/sivar.h b/sys/dev/si/sivar.h
index 042355132ad50..939c4cdf901c4 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.26.1 2005/01/30 01:00:01 imp Exp $
  */
 
 int	siattach(device_t dev);
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index cc63c993e615a..fc04ed9eeaef1 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.450.2.1 2005/02/12 15:38:09 rwatson Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index 40541e6625214..07e81bab0fc13 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.14.2.1 2005/01/30 01:00:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index 713393a87097a..bdff0120c3d2c 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pccard.c,v 1.13.2.1 2005/01/30 01:00:01 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c
index d79f12a138d39..5bdc188a52cee 100644
--- a/sys/dev/sio/sio_pci.c
+++ b/sys/dev/sio/sio_pci.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.16.2.1 2004/11/07 22:33:05 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c
index 877a03966d07a..7eeeeaa7e1305 100644
--- a/sys/dev/sio/sio_puc.c
+++ b/sys/dev/sio/sio_puc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.8 2003/12/27 19:47:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 7b00452c88ce9..51e09ed2b6d9c 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.24 2004/04/07 20:45:58 imp Exp $
  */
 
 /* Receiver clock frequency for "standard" pc serial ports. */
diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h
index 22a6019d8e62e..094bdd14fe21c 100644
--- a/sys/dev/sio/siovar.h
+++ b/sys/dev/sio/siovar.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/sio/siovar.h,v 1.6 2004/04/07 20:45:58 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 4c1c5b199f91c..7bdb7ce6599fe 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.34 2004/06/16 09:46:56 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index 387515f62a55f..23d1378ccff32 100644
--- a/sys/dev/smbus/smb.h
+++ b/sys/dev/smbus/smb.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/smb.h,v 1.4 2004/05/16 21:18:45 joerg Exp $
  *
  */
 #ifndef __SMB_H
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 8a8500924a268..324d2c85e2411 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/smbus/smbconf.c,v 1.13 2003/08/24 18:03:44 obrien Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index 64b0a3354c36c..7c96366ba15a3 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.7 2002/03/23 15:47:28 nsouch Exp $
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index ed9c468e66e35..6cbc00a2e409e 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/smbus/smbus.c,v 1.18 2003/09/06 13:58:06 dfr Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index 9f96b9dfe1729..dadb052f38edb 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 6b213e1f4c237..68fe59821745d 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.6.8.1 2005/01/30 01:00:02 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 07cefd5667763..90063a58cff6c 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.41.2.1 2005/01/30 01:00:02 imp Exp $");
 
 /*
  * This is a driver for SMC's 9000 series of Ethernet adapters.
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index 7907f744764cc..1adb06acc455c 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_isa.c,v 1.12.4.1 2005/01/30 01:00:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index f1556c0d18f78..1941673223a9c 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.25.2.1 2005/02/03 00:36:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_snreg.h b/sys/dev/sn/if_snreg.h
index 3f5efd01f5a7d..28b567bc75528 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.4.4.1 2005/01/30 01:00:02 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index 91c6d8a5b596e..d18bdeabfcaa8 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.5.4.1 2005/01/30 01:00:02 imp Exp $
  */
 
 #ifndef _IF_SNVAR_H
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 90806990ac8aa..9fb1a608ef49a 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.15.2.2 2005/02/24 15:58:37 mlaier Exp $	*/
 /*	$NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $	*/
 /*	$NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $	*/
 
diff --git a/sys/dev/snc/dp83932reg.h b/sys/dev/snc/dp83932reg.h
index 31ab550b83ca5..7718e7163b2d5 100644
--- a/sys/dev/snc/dp83932reg.h
+++ b/sys/dev/snc/dp83932reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932reg.h,v 1.1.10.1 2005/01/30 01:00:02 imp Exp $	*/
 /*	$NecBSD: dp83932reg.h,v 1.2 1999/02/12 05:50:13 kmatsuda Exp $	*/
 /*      $NetBSD: if_snreg.h,v 1.4 1997/06/15 20:20:12 scottr Exp $	*/
 
diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c
index 064cb2c3d614a..8dc778ee196cd 100644
--- a/sys/dev/snc/dp83932subr.c
+++ b/sys/dev/snc/dp83932subr.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.6.4.1 2005/01/30 01:00:02 imp Exp $");
 /*
  * Routines of NEC PC-9801-83, 84, 103, 104, PC-9801N-25 and PC-9801N-J02, J02R 
  * Ethernet interface for NetBSD/pc98, ported by Kouichi Matsuda.
diff --git a/sys/dev/snc/dp83932subr.h b/sys/dev/snc/dp83932subr.h
index f5df4f97970f5..ff078edd83883 100644
--- a/sys/dev/snc/dp83932subr.h
+++ b/sys/dev/snc/dp83932subr.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932subr.h,v 1.2.8.1 2005/01/30 01:00:02 imp Exp $	*/
 /*	$NecBSD: dp83932subr.h,v 1.5 1999/02/02 00:47:25 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h
index f621397b930d8..b08d2ddd44128 100644
--- a/sys/dev/snc/dp83932var.h
+++ b/sys/dev/snc/dp83932var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932var.h,v 1.3.6.1 2005/01/30 01:00:02 imp Exp $	*/
 /*	$NecBSD: dp83932var.h,v 1.3 1999/01/24 01:39:51 kmatsuda Exp $	*/
 /*	$NetBSD: if_snvar.h,v 1.12 1998/05/01 03:42:47 scottr Exp $	*/
 
diff --git a/sys/dev/snc/if_snc.c b/sys/dev/snc/if_snc.c
index 7cbdd804f7ba0..73f30ac3b749a 100644
--- a/sys/dev/snc/if_snc.c
+++ b/sys/dev/snc/if_snc.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc.c,v 1.6.2.1 2005/01/30 01:00:02 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c
index 1b9ef3ef56557..c77aecf2e61e9 100644
--- a/sys/dev/snc/if_snc_cbus.c
+++ b/sys/dev/snc/if_snc_cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_cbus.c,v 1.5.4.1 2005/01/30 01:00:02 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_snc_pccard.c b/sys/dev/snc/if_snc_pccard.c
index c22fa756e42f4..d4669886219cb 100644
--- a/sys/dev/snc/if_snc_pccard.c
+++ b/sys/dev/snc/if_snc_pccard.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.5.2.1 2005/01/30 01:00:02 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_sncreg.h b/sys/dev/snc/if_sncreg.h
index 888aa4f3ceb39..3c4d81232c059 100644
--- a/sys/dev/snc/if_sncreg.h
+++ b/sys/dev/snc/if_sncreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.1.10.1 2005/01/30 01:00:02 imp Exp $	*/
 /*	$NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
   
diff --git a/sys/dev/snc/if_sncvar.h b/sys/dev/snc/if_sncvar.h
index 8b6a75b998127..92bec345e7a7f 100644
--- a/sys/dev/snc/if_sncvar.h
+++ b/sys/dev/snc/if_sncvar.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/snc/if_sncvar.h,v 1.2.8.1 2005/01/30 01:00:02 imp Exp $
  */
 
 /*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index eea89c03aae29..0a35b4752f237 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.93.2.1 2005/01/30 01:00:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 012910c978d30..5acbb18f12df0 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/driver.c b/sys/dev/sound/driver.c
index 7da109923b16d..a47229d174b55 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.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/driver.c,v 1.12.2.1 2005/01/30 01:00:03 imp Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index f34a5c623f650..1ccdc1caf4f73 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -33,7 +33,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.33.2.3 2005/01/30 01:00:03 imp Exp $");
 
 struct ad1816_info;
 
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index 3fe4a3dc3ff19..a3cb4ed94e84d 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.12.1 2005/01/30 01:00:03 imp Exp $
  */
 
 /* AD1816 register macros */
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index b8d33cee6afe3..85678ce097b7d 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.c
@@ -29,7 +29,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.11.2.1 2005/01/30 01:00:03 imp Exp $");
 
 #ifdef __alpha__
 static int
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 248aebe833bac..2549ffa57b824 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.31.2.3 2005/01/30 01:00:03 imp Exp $");
 
 #define ESS_BUFFSIZE (4096)
 #define ABS(x) (((x) < 0)? -(x) : (x))
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index cb1b1ade4e9a1..cd7484e7d8a99 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -45,7 +45,7 @@
 #include <alpha/isa/isavar.h>
 #endif
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.14.2.2 2005/01/30 01:00:03 imp Exp $");
 
 #define LOGICALID_NOPNP 0
 #define LOGICALID_PCM   0x0000561e
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 11a5e4f9a9fc4..e3926651b8ab9 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -29,7 +29,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.90.2.4 2005/02/27 23:32:21 mdodd Exp $");
 
 /* board-specific include files */
 #include <dev/sound/isa/mss.h>
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index 07ac1484bc06e..717a199adee2b 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -33,7 +33,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.h,v 1.11.8.1 2005/01/30 01:00:03 imp Exp $
  */
 
 /*
@@ -331,7 +331,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.11.8.1 2005/01/30 01:00:03 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index ddcb863f5de67..d9459c7282a41 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.15 2004/05/13 11:32:54 truckman Exp $
  */
 
 #ifndef SB_H
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 58cb46ff5defe..a5618d44455fa 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.87.2.3 2005/01/30 01:00:03 imp Exp $");
 
 #define SB16_BUFFSIZE	4096
 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16)
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index eefe025445365..dd10954a8021d 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.77.2.2 2005/01/30 01:00:03 imp Exp $");
 
 #define SB_DEFAULT_BUFSZ	4096
 
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index d41cf1029307c..dfd62023275b1 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -30,7 +30,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.42.2.2 2005/01/30 01:00:03 imp Exp $");
 
 #define IO_MAX	3
 #define IRQ_MAX	1
diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c
index 9e45cde9636d2..5731cd9687f92 100644
--- a/sys/dev/sound/isa/sndbuf_dma.c
+++ b/sys/dev/sound/isa/sndbuf_dma.c
@@ -28,7 +28,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sndbuf_dma.c,v 1.2.4.1 2005/01/30 01:00:03 imp Exp $");
 
 int
 sndbuf_dmasetup(struct snd_dbuf *b, struct resource *drq)
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 6f909ccbb0ede..4d0e7eba3978f 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -42,7 +42,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.16.2.1 2005/01/30 01:00:03 imp Exp $");
 
 /* Debugging macro's */
 #undef DEB
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index 00661a039b453..5abe228bf0d72 100644
--- a/sys/dev/sound/pci/als4000.h
+++ b/sys/dev/sound/pci/als4000.h
@@ -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/als4000.h,v 1.2.8.1 2005/01/30 01:00:03 imp Exp $
  */
 
 #define ALS_PCI_ID0 		0x40004005
diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c
index c5f845b5f7556..d160e46a2237d 100644
--- a/sys/dev/sound/pci/au88x0.c
+++ b/sys/dev/sound/pci/au88x0.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/sound/pci/au88x0.c,v 1.8.2.1 2004/11/23 08:37:48 yongari Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/au88x0.h b/sys/dev/sound/pci/au88x0.h
index 15f7b767a0c77..bae2c032bb03e 100644
--- a/sys/dev/sound/pci/au88x0.h
+++ b/sys/dev/sound/pci/au88x0.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/sound/pci/au88x0.h,v 1.2 2003/10/12 11:33:39 des Exp $
  */
 
 #ifndef _AU88X0_H_INCLUDED
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 8ff1b40576961..b578fa30a106e 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -31,7 +31,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.29.2.2 2005/01/30 01:00:03 imp Exp $");
 
 /* PCI IDs of supported chips */
 #define AU8820_PCI_ID 0x000112eb
diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h
index e835c7119fcb3..35164346410d1 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.3.4.1 2005/01/30 01:00:03 imp Exp $
  */
 
 #ifndef _AU8820_REG_H
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 196fb69353dc7..5369c73d79100 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -51,7 +51,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.29.2.1 2005/01/30 01:00:03 imp Exp $");
 
 /* Supported chip ID's */
 #define CMI8338A_PCI_ID   0x010013f6
diff --git a/sys/dev/sound/pci/cmireg.h b/sys/dev/sound/pci/cmireg.h
index 5c468b55ed8b8..c0ec207a005f3 100644
--- a/sys/dev/sound/pci/cmireg.h
+++ b/sys/dev/sound/pci/cmireg.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/cmireg.h,v 1.2.8.1 2005/01/30 01:00:03 imp Exp $
  */
 
 /* C-Media CMI8x38 Audio Chip Support */
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index f8da280cb43a3..ec829d67ddd2c 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -37,7 +37,7 @@
 
 #include <dev/sound/pci/cs4281.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.20.2.1 2005/01/30 01:00:03 imp Exp $");
 
 #define CS4281_DEFAULT_BUFSZ 16384
 
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index c7b3799ab89db..43af3f905c914 100644
--- a/sys/dev/sound/pci/cs4281.h
+++ b/sys/dev/sound/pci/cs4281.h
@@ -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/cs4281.h,v 1.3.8.1 2005/01/30 01:00:03 imp Exp $
  */
 
 #ifndef _CS4281_H_
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index d9823d732e25a..b3162320dcbbb 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -48,7 +48,7 @@
 
 #include <gnu/dev/sound/pci/csaimg.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.30.2.1 2005/01/30 01:00:03 imp Exp $");
 
 /* This is the pci device id. */
 #define CS4610_PCI_ID 0x60011013
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 753f518e2502c..25c1e1350fc81 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -38,7 +38,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.31.2.2 2005/01/30 01:00:03 imp Exp $");
 
 /* Buffer size on dma transfer. Fixed for CS416x. */
 #define CS461x_BUFFSIZE   (4 * 1024)
diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h
index 8ed292a3298ae..4c9f7f21bd03f 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.3 2001/05/30 22:38:31 cg Exp $
  */
 
 #ifndef _CSA_REG_H
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index f46a6257e2597..fcd3b93ac795f 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.4 2001/06/23 18:00:06 cg Exp $
  */
 
 #ifndef _CSA_VAR_H
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index a34d2338954c4..18c4d9f48a9d7 100644
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.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/sound/pci/ds1-fw.h,v 1.3.8.1 2005/01/30 01:00:03 imp Exp $
  */
 #ifndef _HWMCODE_
 #define _HWMCODE_
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index fa70de1d149e3..5cdfcf85203d6 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -33,7 +33,7 @@
 #include <dev/sound/pci/ds1.h>
 #include <dev/sound/pci/ds1-fw.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.40.2.2 2005/01/30 01:00:03 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h
index ad4e829cbfee1..8cccf33d1808f 100644
--- 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 2000/05/31 03:21:36 cg Exp $
  */
 
 
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 3716cc07ff292..cd5babd823dd0 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -35,7 +35,7 @@
 #include <dev/pci/pcivar.h>
 #include <sys/queue.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.52.2.2 2005/01/30 01:00:04 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index b23245e9328fe..2ac6e57c9eca0 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -59,7 +59,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.51.2.2 2005/01/30 01:00:04 imp Exp $");
 
 static int debug = 0;
 SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, "");
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index 8d9b9915050a6..b6852de786369 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.4.8.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index ab11f5739e2f8..17a74269ac198 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -29,7 +29,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.23.2.2 2005/01/30 01:00:04 imp Exp $");
 
 #define PCI_VENDOR_FORTEMEDIA	0x1319
 #define PCI_DEVICE_FORTEMEDIA1	0x08011319
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 54de2924dc7f7..c0be9d8c4b481 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -32,7 +32,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.42.2.5 2005/03/30 01:09:21 murray Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index be3f3fca3b4a3..37a326157868e 100644
--- a/sys/dev/sound/pci/ich.h
+++ b/sys/dev/sound/pci/ich.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ich.h,v 1.3.4.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #define PCIR_NAMBAR 0x10
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index fb39b22428c10..e139b8bd97be6 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -51,7 +51,7 @@
 
 #include <dev/sound/pci/maestro_reg.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.23.2.2 2005/01/30 01:00:04 imp Exp $");
 
 #define inline __inline
 
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 35d693772e344..9a74dbfb59383 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -61,7 +61,7 @@
 #include <gnu/dev/sound/pci/maestro3_reg.h>
 #include <gnu/dev/sound/pci/maestro3_dsp.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.25.2.1 2004/11/23 08:37:48 yongari Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index 41ce3510295f2..521d7af2b4ef7 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: maestro_reg.h,v 1.10 2000/08/29 17:27:29 taku Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/maestro_reg.h,v 1.2 2001/01/03 01:32:57 jhb Exp $
  */
 
 #ifndef	MAESTRO_REG_H_INCLUDED
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index 2fec6427ae145..b5da4433a3c63 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.3.2.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #define NM_TOTAL_COEFF_COUNT 0x3158
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 3ed79e5cfb889..c8b4defecb212 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -34,7 +34,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.33.2.1 2005/01/30 01:00:04 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index 0b87f99cbf977..2b681153c1c5c 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.3.4.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #ifndef _NM256_H_
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index ed102753c1b8f..b309873ee3b9f 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -33,7 +33,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.32.2.2 2005/01/30 01:00:04 imp Exp $");
 
 #define SOLO_DEFAULT_BUFSZ 16384
 #define ABS(x) (((x) < 0)? -(x) : (x))
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index f570f07734725..861d66c6487ea 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -31,7 +31,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.44.2.3 2005/01/30 01:00:04 imp Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index 4a2ec626c5083..d41a2dfa0188e 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.6.4.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #ifndef _T4DWAVE_REG_H
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 2c338685837f7..d76ca1db3e8d4 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -44,7 +44,7 @@
 
 #include <dev/sound/pci/via8233.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.17.2.2 2005/01/30 01:00:04 imp Exp $");
 
 #define VIA8233_PCI_ID 0x30591106
 
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index a38afc96255c3..a68975e68245a 100644
--- a/sys/dev/sound/pci/via8233.h
+++ b/sys/dev/sound/pci/via8233.h
@@ -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/via8233.h,v 1.3.6.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #ifndef _SYS_SOUND_PCI_VIA8233_H_
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 6a94a1992fe7a..4c5b64f77b92d 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -33,7 +33,7 @@
 
 #include <dev/sound/pci/via82c686.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.31.2.2 2005/01/30 01:00:04 imp Exp $");
 
 #define VIA_PCI_ID 0x30581106
 #define	NSEGS		4	/* Number of segments in SGD table */
diff --git a/sys/dev/sound/pci/via82c686.h b/sys/dev/sound/pci/via82c686.h
index ac6750e71b08a..a4a9a086fd441 100644
--- a/sys/dev/sound/pci/via82c686.h
+++ b/sys/dev/sound/pci/via82c686.h
@@ -33,7 +33,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/via82c686.h,v 1.6 2003/03/26 05:35:38 orion Exp $
  */
 
 #ifndef _VIA_H
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index 801a2edaab631..122b7ea244f47 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -36,7 +36,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.17.2.1 2005/01/30 01:00:04 imp Exp $");
 
 /* ------------------------------------------------------------------------- */
 /* Constants */
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index d1eac407efbe4..bd44c8752a87c 100644
--- a/sys/dev/sound/pci/vibes.h
+++ b/sys/dev/sound/pci/vibes.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/vibes.h,v 1.1.10.1 2005/01/30 01:00:04 imp Exp $
  */
 
 /* ------------------------------------------------------------------------- */
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index e0cc5b550db31..c4fc15792bac1 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -30,7 +30,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.51.2.1.2.1 2005/05/01 14:32:06 scottl Exp $");
 
 MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
 
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 2d2db4b22f5e6..0b908f50a548e 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.15.4.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #define AC97_MUTE	0x8080
diff --git a/sys/dev/sound/pcm/ac97_if.m b/sys/dev/sound/pcm/ac97_if.m
index 19f7378d1c6d2..15c96bb02ff2a 100644
--- a/sys/dev/sound/pcm/ac97_if.m
+++ b/sys/dev/sound/pcm/ac97_if.m
@@ -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/pcm/ac97_if.m,v 1.3.8.1 2005/01/30 01:00:04 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c
index 05c73d7553a78..0ef1d8c6ba24d 100644
--- a/sys/dev/sound/pcm/ac97_patch.c
+++ b/sys/dev/sound/pcm/ac97_patch.c
@@ -27,7 +27,7 @@
 #include <dev/sound/pcm/ac97.h>
 #include <dev/sound/pcm/ac97_patch.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97_patch.c,v 1.2.4.1 2005/01/30 01:00:04 imp Exp $");
 
 void ad1886_patch(struct ac97_info* codec)
 {
diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h
index d0184c4c6be2a..a77c73371b9db 100644
--- a/sys/dev/sound/pcm/ac97_patch.h
+++ b/sys/dev/sound/pcm/ac97_patch.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/ac97_patch.h,v 1.2.4.1 2005/01/30 01:00:04 imp Exp $
  */
 
 typedef void (*ac97_patch)(struct ac97_info*);
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 9ca6a3238441e..365b6a6e3818d 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.23.2.2 2005/01/30 01:00:04 imp Exp $");
 
 struct snd_dbuf *
 sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel)
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index 7b2bffbe127bc..a82a3edd379e3 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.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/buffer.h,v 1.9.2.1 2005/01/30 01:00:04 imp Exp $
  */
 
 #define SND_DMA(b) (sndbuf_getflags((b)) & SNDBUF_F_DMA)
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 2948e41c9d2d7..0ce919ff345c5 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -29,7 +29,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.97.2.1 2005/01/30 01:00:04 imp Exp $");
 
 #define MIN_CHUNK_SIZE 		256	/* for uiomove etc. */
 #define	DMA_ALIGN_THRESHOLD	4
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 23cd7199f58be..5beb67bb21bcd 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.30.2.1 2005/01/30 01:00:04 imp Exp $
  */
 
 struct pcmchan_children {
diff --git a/sys/dev/sound/pcm/channel_if.m b/sys/dev/sound/pcm/channel_if.m
index cdc6a3b6f2b32..17ec5023f1a60 100644
--- a/sys/dev/sound/pcm/channel_if.m
+++ b/sys/dev/sound/pcm/channel_if.m
@@ -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/pcm/channel_if.m,v 1.4.8.1 2005/01/30 01:00:04 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 1adc6ceed3417..89c15841c6401 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -29,7 +29,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.77.2.1 2005/01/30 01:00:04 imp Exp $");
 
 #define OLDPCM_IOCTL
 
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index 0d067ededb1a1..a41766fe7a65a 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.8.2.1 2005/01/30 01:00:04 imp Exp $
  */
 
 extern struct cdevsw dsp_cdevsw;
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index ba9c4b641303a..f5089cc281e7f 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -26,7 +26,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/fake.c,v 1.13.4.1 2005/01/30 01:00:05 imp Exp $");
 
 static u_int32_t fk_fmt[] = {
 	AFMT_U8,
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 5bc7b81ae2b9b..610749f3422c6 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.32.4.1 2005/01/30 01:00:05 imp Exp $");
 
 MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
 
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 1a9c37b751aa7..d13defed84f41 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.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/feeder.h,v 1.11.4.1 2005/01/30 01:00:05 imp Exp $
  */
 
 struct pcm_feederdesc {
diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c
index 7eb66f515fd1f..74b356c91fce0 100644
--- a/sys/dev/sound/pcm/feeder_fmt.c
+++ b/sys/dev/sound/pcm/feeder_fmt.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.13.4.1 2005/01/30 01:00:05 imp Exp $");
 
 MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder");
 
diff --git a/sys/dev/sound/pcm/feeder_if.m b/sys/dev/sound/pcm/feeder_if.m
index 83c0fb073b538..9bd333139a0ce 100644
--- a/sys/dev/sound/pcm/feeder_if.m
+++ b/sys/dev/sound/pcm/feeder_if.m
@@ -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/pcm/feeder_if.m,v 1.5.8.1 2005/01/30 01:00:05 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index 55d51fc1e2dc8..80eb98850f12d 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -48,7 +48,7 @@
 #include <dev/sound/pcm/sound.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.10.6.1 2005/01/30 01:00:05 imp Exp $");
 
 #endif /* _KERNEL */
 
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index fed0fc5a3be52..d39e17c9b174f 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -28,7 +28,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.40.2.1 2005/01/30 01:00:05 imp Exp $");
 
 MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 2c8dff753e366..6c9a6813c8204 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.13.2.1 2005/01/30 01:00:05 imp Exp $
  */
 
 int mixer_init(device_t dev, kobj_class_t cls, void *devinfo);
diff --git a/sys/dev/sound/pcm/mixer_if.m b/sys/dev/sound/pcm/mixer_if.m
index 9bd974ce7d9e1..d1c8104218eaf 100644
--- a/sys/dev/sound/pcm/mixer_if.m
+++ b/sys/dev/sound/pcm/mixer_if.m
@@ -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/pcm/mixer_if.m,v 1.5.8.1 2005/01/30 01:00:05 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index 7113bf1e6d24e..adc8c3f9dbb06 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -30,7 +30,7 @@
 #include <sys/sx.h>
 #endif
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sndstat.c,v 1.17.2.2 2005/01/30 01:00:05 imp Exp $");
 
 #define	SS_TYPE_MODULE		0
 #define	SS_TYPE_FIRST		1
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index fd4ce76bf80fc..7bea6c9f29eef 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -32,7 +32,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.92.2.1 2005/01/30 01:00:05 imp Exp $");
 
 devclass_t pcm_devclass;
 
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index e4cac240247dd..0eb56bb7e6714 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.61.2.1 2005/01/30 01:00:05 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index 91a114e65706c..87410945b0933 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -28,7 +28,7 @@
 #include <dev/sound/pcm/vchan.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/vchan.c,v 1.16.2.1 2005/01/30 01:00:05 imp Exp $");
 
 struct vchinfo {
 	u_int32_t spd, fmt, blksz, bps, run;
diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h
index cb9e1c8ea17ce..4e089b6d7f131 100644
--- a/sys/dev/sound/pcm/vchan.h
+++ b/sys/dev/sound/pcm/vchan.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/vchan.h,v 1.3.4.1 2005/01/30 01:00:05 imp Exp $
  */
 
 int vchan_create(struct pcm_channel *parent);
diff --git a/sys/dev/sound/sbus/apcdmareg.h b/sys/dev/sound/sbus/apcdmareg.h
index d4296adbe9feb..a9618c802c467 100644
--- a/sys/dev/sound/sbus/apcdmareg.h
+++ b/sys/dev/sound/sbus/apcdmareg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/sound/sbus/apcdmareg.h,v 1.1.2.2 2005/01/30 01:00:05 imp Exp $	*/
 /*	$OpenBSD: apcdmareg.h,v 1.2 2003/06/02 18:53:18 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c
index 11f6b0806bb21..83b41f516ea12 100644
--- a/sys/dev/sound/sbus/cs4231.c
+++ b/sys/dev/sound/sbus/cs4231.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sound/sbus/cs4231.c,v 1.1.2.2 2005/01/30 01:00:05 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/sbus/cs4231.h b/sys/dev/sound/sbus/cs4231.h
index 2b160c178da68..23995fd92e4ae 100644
--- a/sys/dev/sound/sbus/cs4231.h
+++ b/sys/dev/sound/sbus/cs4231.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/sound/sbus/cs4231.h,v 1.1.2.1 2004/12/13 11:12:49 yongari Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 985ffbf1a121d..b54d79f1963da 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $	*/
-/*	$FreeBSD$: */
+/*	$FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.7.8.1 2005/01/30 01:00:05 imp Exp $: */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index 5542f9d9da1ed..d9a136acc9e53 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.1.10.1 2005/01/30 01:00:05 imp Exp $ */
 
 /*-
  * Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 851107eba79e9..4b768404c7b39 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.5.2.1 2005/01/30 01:00:05 imp Exp $ */
 
 /*-
  * Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index aa2aa5e790181..4870c5d2d0114 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.2.8.1 2005/01/30 01:00:05 imp Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 033b3393145fb..210e7cd8a048a 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.63.2.1 2005/01/30 01:00:06 imp Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/sr/if_sr.h b/sys/dev/sr/if_sr.h
index c66f667f0023d..2d229a5f643a3 100644
--- a/sys/dev/sr/if_sr.h
+++ b/sys/dev/sr/if_sr.h
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sr/if_sr.h,v 1.3.10.1 2005/01/30 01:00:06 imp Exp $
  */
 
 #ifndef _I386_ISA_IF_SR_H_
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 510a32b74196f..49313f058256c 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr_isa.c,v 1.49.4.1 2005/01/30 01:00:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 389476126660a..e7052661fea06 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr_pci.c,v 1.20.2.1 2005/01/30 01:00:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 16925e6e581e8..e2f05930e913b 100644
--- a/sys/dev/sr/if_srregs.h
+++ b/sys/dev/sr/if_srregs.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/sr/if_srregs.h,v 1.8.6.1 2005/01/30 01:00:06 imp Exp $
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index c07c4c8b516d5..213ed147dbbb3 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.12.2.1 2005/01/30 01:00:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30.h b/sys/dev/stg/tmc18c30.h
index 8a1848c6b5bf3..0033a822bb2c8 100644
--- a/sys/dev/stg/tmc18c30.h
+++ b/sys/dev/stg/tmc18c30.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/stg/tmc18c30.h,v 1.1 2003/04/07 10:13:25 mdodd Exp $
  */
 
 extern devclass_t stg_devclass;
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index 40966697dc43c..25584168fc486 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_isa.c,v 1.10.4.1 2005/01/30 01:00:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 67bffd3f40c28..f3b24e852d50d 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.21.2.1 2005/01/30 01:00:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c
index 8f8b24e4d0ab3..da7f9f0e54d9b 100644
--- a/sys/dev/stg/tmc18c30_pci.c
+++ b/sys/dev/stg/tmc18c30_pci.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pci.c,v 1.4 2003/09/02 17:30:38 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c
index c2cfd44b42ac7..ce22c100437ac 100644
--- a/sys/dev/stg/tmc18c30_subr.c
+++ b/sys/dev/stg/tmc18c30_subr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_subr.c,v 1.3.2.1 2005/01/30 01:00:06 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30reg.h b/sys/dev/stg/tmc18c30reg.h
index 93c9940ba6492..1a43b371b94f1 100644
--- a/sys/dev/stg/tmc18c30reg.h
+++ b/sys/dev/stg/tmc18c30reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/stg/tmc18c30reg.h,v 1.2.8.1 2005/01/30 01:00:06 imp Exp $	*/
 /*	$NecBSD: tmc18c30reg.h,v 1.4.24.1 2001/06/08 06:27:50 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h
index 69e837fc6786b..23e240e39767a 100644
--- a/sys/dev/stg/tmc18c30var.h
+++ b/sys/dev/stg/tmc18c30var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/stg/tmc18c30var.h,v 1.7.8.1 2005/01/30 01:00:06 imp Exp $	*/
 /*	$NecBSD: tmc18c30var.h,v 1.12.18.2 2001/06/13 05:51:23 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 0a15c86dad3d4..802ed959421fd 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.47.2.2 2005/02/27 02:34:04 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sx/cd1865.h b/sys/dev/sx/cd1865.h
index 297a415ff6985..3f2e254f156e0 100644
--- a/sys/dev/sx/cd1865.h
+++ b/sys/dev/sx/cd1865.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/cd1865.h,v 1.1.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c
index 0a7921fb75e38..13c965e4c13db 100644
--- a/sys/dev/sx/sx.c
+++ b/sys/dev/sx/sx.c
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx.c,v 1.12.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sx.h b/sys/dev/sx/sx.h
index eb36cf5595d70..cf3c2e612725a 100644
--- a/sys/dev/sx/sx.h
+++ b/sys/dev/sx/sx.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx.h,v 1.3.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sx_pci.c b/sys/dev/sx/sx_pci.c
index 49052947791f0..e8878fbd43abb 100644
--- a/sys/dev/sx/sx_pci.c
+++ b/sys/dev/sx/sx_pci.c
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx_pci.c,v 1.4.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sx/sx_util.c b/sys/dev/sx/sx_util.c
index 0eeb8aeb75495..aafc37d89e4b3 100644
--- a/sys/dev/sx/sx_util.c
+++ b/sys/dev/sx/sx_util.c
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx_util.c,v 1.1.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 #include "opt_debug_sx.h"
diff --git a/sys/dev/sx/sx_util.h b/sys/dev/sx/sx_util.h
index 57f42c9f75178..90cbfb6d71528 100644
--- a/sys/dev/sx/sx_util.h
+++ b/sys/dev/sx/sx_util.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sx_util.h,v 1.1.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 
diff --git a/sys/dev/sx/sxvar.h b/sys/dev/sx/sxvar.h
index fa33e371ec901..4819cf413532b 100644
--- a/sys/dev/sx/sxvar.h
+++ b/sys/dev/sx/sxvar.h
@@ -24,7 +24,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sx/sxvar.h,v 1.1.2.1 2005/01/30 01:00:06 imp Exp $
  */
 
 
diff --git a/sys/dev/sym/README.sym b/sys/dev/sym/README.sym
index d310cd4d150fb..4cd7bbe279787 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.5.8.1 2005/01/30 01:00:07 imp Exp $
  */
 
 README.sym
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 768baa7b10a59..30120a612874f 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.8.8.1 2005/01/30 01:00:07 imp 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 ad1481f71af3f..548db2ad75f6a 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.10.8.1 2005/01/30 01:00:07 imp 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 a274bbcee4302..0c248131372aa 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.4.4.1 2005/01/30 01:00:07 imp 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 9a43dc431f0d5..9ed7320d812b3 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.6.6.1 2005/01/30 01:00:07 imp Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 5ff740aa3cd94..b6ab6616ebba0 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.7.6.1 2005/01/30 01:00:07 imp Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index ced33f34c1666..53ec63cae200e 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.48.2.1 2004/09/19 01:07:23 mjacob Exp $");
 
 #define SYM_DRIVER_NAME	"sym-1.6.5-20000902"
 
diff --git a/sys/dev/syscons/apm/apm_saver.c b/sys/dev/syscons/apm/apm_saver.c
index 1ef6bded320b2..f1de420ffc284 100644
--- a/sys/dev/syscons/apm/apm_saver.c
+++ b/sys/dev/syscons/apm/apm_saver.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/apm/apm_saver.c,v 1.9 2003/03/27 07:37:02 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 960acca5a5122..03c6df0780d8d 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.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/blank/blank_saver.c,v 1.17 1999/08/28 00:47:45 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 3cd58305cde5d..7178e43e2328f 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.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/daemon/daemon_saver.c,v 1.22 2003/02/19 05:47:14 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/dragon/dragon_saver.c b/sys/dev/syscons/dragon/dragon_saver.c
index f8fa51b5e08bd..f847f3f7eabc9 100644
--- a/sys/dev/syscons/dragon/dragon_saver.c
+++ b/sys/dev/syscons/dragon/dragon_saver.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/dragon/dragon_saver.c,v 1.2 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include	<sys/param.h>
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index d7793b6dd96f2..3b057c8ae7dac 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.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/fade/fade_saver.c,v 1.19 2003/05/31 20:29:34 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index 0bc031cad7cb1..3ec42cb5cd662 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.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/fire/fire_saver.c,v 1.10 2003/07/21 13:04:54 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index d6cfe80da6897..f37d377eac732 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.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/green/green_saver.c,v 1.17 1999/08/28 00:47:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/logo/logo.c b/sys/dev/syscons/logo/logo.c
index ea3f46e5c3a7e..f9d3b419c88cb 100644
--- a/sys/dev/syscons/logo/logo.c
+++ b/sys/dev/syscons/logo/logo.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/syscons/logo/logo.c,v 1.3 2001/08/09 00:02:30 peter Exp $ */
 
 #define logo_width 88
 #define logo_height 88
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 0a75886388baf..9ad2c6f1f9a1d 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.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/logo/logo_saver.c,v 1.12 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 80e2212ee3c7a..0987e2e22e753 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.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/rain/rain_saver.c,v 1.12 2003/02/02 13:52:25 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index cba157e0aca71..407db639ddc47 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.19 2004/01/21 05:08:51 grehan Exp $");
 
 #include "opt_syscons.h"
 #include "opt_gfb.h"
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index c83048e13f044..880bbcfb16e92 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/schistory.c,v 1.19 2004/01/21 05:08:51 grehan Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index a2b7a211f392d..bc544c2be44dd 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.36 2003/08/24 18:17:23 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
index 4e93a6af1b0d2..360a0278eba17 100644
--- a/sys/dev/syscons/scterm-dumb.c
+++ b/sys/dev/syscons/scterm-dumb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-dumb.c,v 1.6 2004/01/21 05:08:51 grehan Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c
index 96059d4829486..ef6a3a14941d0 100644
--- a/sys/dev/syscons/scterm-sc.c
+++ b/sys/dev/syscons/scterm-sc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.21 2004/05/30 20:08:42 phk Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 0b9135a4a0076..f167ad32a3356 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm.c,v 1.6 2003/08/24 18:17:24 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/sctermvar.h b/sys/dev/syscons/sctermvar.h
index b1c01af1f800f..5d24deef6e062 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.4 2002/10/20 22:50:13 robert Exp $
  */
 
 #ifndef _DEV_SYSCONS_SCTERMVAR_H_
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index dbc0dfc3fe888..173f716349f19 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.20 2004/06/16 09:46:58 phk Exp $");
 
 #include "opt_vga.h"
 
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index b26aa3d1aabc6..21da00cac2ea9 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.15 2004/05/30 20:08:42 phk Exp $");
 
 #include "opt_syscons.h"
 #include "opt_vga.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 8fbb3c78c7551..dcd86917cc9ae 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.32 2004/07/13 16:06:19 stefanf Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 898d7f7019767..5010ce8cc458e 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvtb.c,v 1.12 2003/08/24 18:17:24 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index ea5651fee2f6a..fc7fc4bfd1649 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.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/snake/snake_saver.c,v 1.30 2003/02/19 05:47:14 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index a1f24b89fcc15..11126304d21c1 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.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/star/star_saver.c,v 1.25 2001/02/21 11:28:02 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d5f76e527c106..f82672f8cf246 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.427.2.1 2004/09/30 17:49:15 nectar Exp $");
 
 #include "opt_syscons.h"
 #include "opt_splash.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 99bf8a4aeec8f..41f975f53c1ab 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.80 2004/07/28 06:29:02 kan Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index ce8fe12079029..3064fd9b7ba94 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.24 2004/07/15 20:47:39 phk Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index 050790d8a391b..049fd49569154 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.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/warp/warp_saver.c,v 1.13 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/tdfx/tdfx_io.h b/sys/dev/tdfx/tdfx_io.h
index faec61e11771d..9897ba094c299 100644
--- a/sys/dev/tdfx/tdfx_io.h
+++ b/sys/dev/tdfx/tdfx_io.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/tdfx/tdfx_io.h,v 1.3.8.1 2005/01/30 01:00:07 imp Exp $
  */
 
 /* This code originally came from <shocking@prth.pgs.com>
diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index a3235cc8ba028..c38b684eb2514 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.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/tdfx/tdfx_linux.h,v 1.5.8.1 2005/01/30 01:00:07 imp Exp $
  */
 
 
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index c0d71259547ef..7bed114f5f336 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.35.2.1 2005/03/03 04:47:55 obrien Exp $");
 
 /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
  *
diff --git a/sys/dev/tdfx/tdfx_pci.h b/sys/dev/tdfx/tdfx_pci.h
index 0c60e5a2b6c12..7fcf7666750de 100644
--- a/sys/dev/tdfx/tdfx_pci.h
+++ b/sys/dev/tdfx/tdfx_pci.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/tdfx/tdfx_pci.h,v 1.3.8.1 2005/01/30 01:00:07 imp Exp $
  */
 
 /* tdfx_pci.h -- Prototypes for tdfx device methods */
diff --git a/sys/dev/tdfx/tdfx_vars.h b/sys/dev/tdfx/tdfx_vars.h
index 1e10e3c3a669d..24c7586fe92a0 100644
--- a/sys/dev/tdfx/tdfx_vars.h
+++ b/sys/dev/tdfx/tdfx_vars.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/tdfx/tdfx_vars.h,v 1.9.2.1 2005/01/30 01:00:07 imp Exp $
  */
 
 /* tdfx_vars.h -- constants and structs used in the tdfx driver
diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c
index 25afbfd006f8d..71c6178c78e07 100644
--- a/sys/dev/tga/tga_pci.c
+++ b/sys/dev/tga/tga_pci.c
@@ -30,7 +30,7 @@
 #include "opt_fb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tga/tga_pci.c,v 1.8.2.3 2005/03/03 04:49:43 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/tga/tga_pci.h b/sys/dev/tga/tga_pci.h
index 21dc74e374179..292b7419eb16e 100644
--- a/sys/dev/tga/tga_pci.h
+++ b/sys/dev/tga/tga_pci.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/tga/tga_pci.h,v 1.1.10.1 2005/01/30 01:00:07 imp Exp $
  */
 
 #ifndef _PCI_TGA_H_
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 0c03791c6761c..396e9101ee64b 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.23.2.2 2005/03/03 04:50:58 obrien Exp $");
 
 /*
  *	HISTORY:					
diff --git a/sys/dev/trm/trm.h b/sys/dev/trm/trm.h
index 21248835a5106..d1787e8cf265c 100644
--- a/sys/dev/trm/trm.h
+++ b/sys/dev/trm/trm.h
@@ -29,7 +29,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/trm/trm.h,v 1.4.2.1 2005/01/30 01:00:08 imp Exp $
  */
 
 #ifndef trm_H
diff --git a/sys/dev/twa/twa.c b/sys/dev/twa/twa.c
index d14a968fac9ba..f553cc749b25c 100644
--- a/sys/dev/twa/twa.c
+++ b/sys/dev/twa/twa.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/twa/twa.c,v 1.2.4.1 2005/01/11 03:00:48 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa.h b/sys/dev/twa/twa.h
index 59f9be8105231..3821e2834fa3b 100644
--- a/sys/dev/twa/twa.h
+++ b/sys/dev/twa/twa.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/twa/twa.h,v 1.4.2.2 2005/02/13 18:34:27 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_cam.c b/sys/dev/twa/twa_cam.c
index d384058b9a88b..a7e5d7a924bb4 100644
--- a/sys/dev/twa/twa_cam.c
+++ b/sys/dev/twa/twa_cam.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/twa/twa_cam.c,v 1.3.2.2 2005/02/13 18:34:27 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_externs.h b/sys/dev/twa/twa_externs.h
index 0d3dba0c7c554..483b1cc693e54 100644
--- a/sys/dev/twa/twa_externs.h
+++ b/sys/dev/twa/twa_externs.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/twa/twa_externs.h,v 1.1.4.1 2005/01/11 03:00:48 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_freebsd.c b/sys/dev/twa/twa_freebsd.c
index b153c011054ee..6753fdda2edcb 100644
--- a/sys/dev/twa/twa_freebsd.c
+++ b/sys/dev/twa/twa_freebsd.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/twa/twa_freebsd.c,v 1.7.2.4 2005/03/23 22:57:47 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_fwimg.c b/sys/dev/twa/twa_fwimg.c
index 3e96a26fb1c72..c72b86c0dca9f 100644
--- a/sys/dev/twa/twa_fwimg.c
+++ b/sys/dev/twa/twa_fwimg.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/twa/twa_fwimg.c,v 1.1.4.1 2005/01/11 03:00:48 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_globals.c b/sys/dev/twa/twa_globals.c
index 9fb0a444f81e7..ae481ef5ff037 100644
--- a/sys/dev/twa/twa_globals.c
+++ b/sys/dev/twa/twa_globals.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/twa/twa_globals.c,v 1.1.4.2 2005/02/13 18:34:27 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_includes.h b/sys/dev/twa/twa_includes.h
index 22cae2e8a46f5..d3687380980da 100644
--- a/sys/dev/twa/twa_includes.h
+++ b/sys/dev/twa/twa_includes.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/twa/twa_includes.h,v 1.3 2004/05/30 20:08:43 phk Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_ioctl.h b/sys/dev/twa/twa_ioctl.h
index 20b95bb307a22..78befa9f1dbab 100644
--- a/sys/dev/twa/twa_ioctl.h
+++ b/sys/dev/twa/twa_ioctl.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/twa/twa_ioctl.h,v 1.1.4.1 2005/02/13 18:34:27 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twa/twa_reg.h b/sys/dev/twa/twa_reg.h
index 48922edf75981..f7b0ba9ed6f82 100644
--- a/sys/dev/twa/twa_reg.h
+++ b/sys/dev/twa/twa_reg.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/twa/twa_reg.h,v 1.1.4.2 2005/01/11 03:00:49 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 96dc538eb4712..6aba891f6026e 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.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/twe/twe.c,v 1.22.2.2 2005/02/18 18:42:16 vkashyap Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 3729100411315..ffb9e3c9c4561 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.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/twe/twe_compat.h,v 1.13 2004/06/16 09:47:00 phk Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index 275ee95bb42f3..a206fe4c51c1a 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.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/twe/twe_freebsd.c,v 1.39.2.2 2005/03/03 05:02:14 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_tables.h b/sys/dev/twe/twe_tables.h
index 3ba83c972c4b7..c8871a280213f 100644
--- a/sys/dev/twe/twe_tables.h
+++ b/sys/dev/twe/twe_tables.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/twe/twe_tables.h,v 1.4 2003/12/02 07:57:20 ps Exp $
  */
 
 /*
diff --git a/sys/dev/twe/tweio.h b/sys/dev/twe/tweio.h
index 1b78472495ab3..d952f853f30ee 100644
--- a/sys/dev/twe/tweio.h
+++ b/sys/dev/twe/tweio.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/twe/tweio.h,v 1.3.4.2 2005/02/18 18:42:16 vkashyap Exp $
  */
 
 
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index f6e7db6e1a03b..2f77bc85cce76 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.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/twe/twereg.h,v 1.11 2004/05/12 04:10:37 vkashyap Exp $
  */
 
 /* 
diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h
index 90391ad95dfca..3245e10fbc057 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.13 2004/06/11 18:42:44 vkashyap Exp $
  */
 
 #define TWE_DRIVER_VERSION_STRING	"1.50.01.002"
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index a7be0290c22d3..a46dff3a8d8b9 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.86.2.1 2005/03/03 05:02:14 obrien Exp $");
 
 /*
  * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie)
diff --git a/sys/dev/tx/if_txreg.h b/sys/dev/tx/if_txreg.h
index 63891cda2457c..291f06e354d6f 100644
--- a/sys/dev/tx/if_txreg.h
+++ b/sys/dev/tx/if_txreg.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/tx/if_txreg.h,v 1.14 2003/09/02 17:30:39 jhb Exp $
  */
 
 #define	EPIC_MAX_MTU		1600	/* This is experiment-derived value */
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index 1277244d98f4d..5d718c48024a6 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.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/tx/if_txvar.h,v 1.18 2003/04/20 18:08:00 mux Exp $
  */
 
 /*
diff --git a/sys/dev/txp/3c990img.h b/sys/dev/txp/3c990img.h
index 6e75f5d83cf01..d0bfe52127bce 100644
--- a/sys/dev/txp/3c990img.h
+++ b/sys/dev/txp/3c990img.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: 3c990img.h,v 1.2 2001/06/05 02:15:17 jason Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/txp/3c990img.h,v 1.1.10.1 2005/01/30 01:00:08 imp Exp $ */
 
 /*-
  * Copyright (C) 1999-2001 3Com, Inc.
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 8e708ebfb75a4..c3212d2a238d5 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -35,14 +35,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.27.2.2 2005/03/03 05:02:14 obrien Exp $");
 
 /*
  * Driver for 3c990 (Typhoon) Ethernet ASIC
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.27.2.2 2005/03/03 05:02:14 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.27.2.2 2005/03/03 05:02:14 obrien Exp $";
 #endif
 
 /*
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index 2d88fc9fd0539..8269865ac36a7 100644
--- a/sys/dev/txp/if_txpreg.h
+++ b/sys/dev/txp/if_txpreg.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/txp/if_txpreg.h,v 1.2.10.1 2005/01/30 01:00:08 imp Exp $ */
 
 /*-
  * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 101304ed68715..299e545049753 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.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/uart/uart.h,v 1.3.4.1 2005/01/30 01:00:08 imp Exp $
  */
 
 #ifndef _DEV_UART_H_
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index 0b2d36b165542..55c49d4acaa4c 100644
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.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/uart/uart_bus.h,v 1.6.2.3 2005/01/30 06:16:37 marcel Exp $
  */
 
 #ifndef _DEV_UART_BUS_H_
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 042dfef5d219a..147c63428ce84 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.2.4.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_ebus.c b/sys/dev/uart/uart_bus_ebus.c
index 15e8bcb9899c3..543f6f2feb89e 100644
--- a/sys/dev/uart/uart_bus_ebus.c
+++ b/sys/dev/uart/uart_bus_ebus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.5 2004/08/12 17:41:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 2a9b83c3ab2ee..64674c52ccfc3 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.3.2.2 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index a1ca4c2e292c5..1366b0d2ccb22 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pccard.c,v 1.8.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index fb2fc6d1bfe12..145a7a8f93adc 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.4.4.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index 7277df99fc41f..db158a448170c 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_puc.c,v 1.2 2003/09/26 05:14:56 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index 7b068187e5653..2124ad0bf5af7 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.10.2.3 2005/03/31 21:55:39 marius Exp $");
 
 #ifndef KLD_MODULE
 #include "opt_comconsole.h"
diff --git a/sys/dev/uart/uart_cpu.h b/sys/dev/uart/uart_cpu.h
index 75e0f6fd73c03..873bc4f12e199 100644
--- a/sys/dev/uart/uart_cpu.h
+++ b/sys/dev/uart/uart_cpu.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/uart/uart_cpu.h,v 1.6.2.1 2005/01/30 01:00:08 imp Exp $
  */
 
 #ifndef _DEV_UART_CPU_H_
diff --git a/sys/dev/uart/uart_cpu_alpha.c b/sys/dev/uart/uart_cpu_alpha.c
index de2dc00989faa..048ea3e3d1fbe 100644
--- a/sys/dev/uart/uart_cpu_alpha.c
+++ b/sys/dev/uart/uart_cpu_alpha.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_alpha.c,v 1.8.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_amd64.c b/sys/dev/uart/uart_cpu_amd64.c
index 0b32113a80ef5..caf4944b65d57 100644
--- a/sys/dev/uart/uart_cpu_amd64.c
+++ b/sys/dev/uart/uart_cpu_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.8.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_i386.c b/sys/dev/uart/uart_cpu_i386.c
index 8ac6d2057ef63..841f77bf0b50c 100644
--- a/sys/dev/uart/uart_cpu_i386.c
+++ b/sys/dev/uart/uart_cpu_i386.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.8.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c
index 8d3e3de8f422f..b72616789b47e 100644
--- a/sys/dev/uart/uart_cpu_ia64.c
+++ b/sys/dev/uart/uart_cpu_ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.8.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_pc98.c b/sys/dev/uart/uart_cpu_pc98.c
index f9eb02eac78b5..9cfb2da797884 100644
--- a/sys/dev/uart/uart_cpu_pc98.c
+++ b/sys/dev/uart/uart_cpu_pc98.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.12.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_sparc64.c b/sys/dev/uart/uart_cpu_sparc64.c
index dc4964a25ad8d..755d66d61a3ec 100644
--- a/sys/dev/uart/uart_cpu_sparc64.c
+++ b/sys/dev/uart/uart_cpu_sparc64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.12.2.3 2005/03/17 13:49:20 kensmith Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index 51d9ec59bddea..d714bd3258931 100644
--- a/sys/dev/uart/uart_dbg.c
+++ b/sys/dev/uart/uart_dbg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dbg.c,v 1.1.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_i8251.c b/sys/dev/uart/uart_dev_i8251.c
index 4da2fa0d795ca..21e6803f9fe18 100644
--- a/sys/dev/uart/uart_dev_i8251.c
+++ b/sys/dev/uart/uart_dev_i8251.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.4 2004/06/24 10:07:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_i8251.h b/sys/dev/uart/uart_dev_i8251.h
index bdb47f3c02cb5..b2f60ea61c48c 100644
--- a/sys/dev/uart/uart_dev_i8251.h
+++ b/sys/dev/uart/uart_dev_i8251.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/uart/uart_dev_i8251.h,v 1.1 2003/09/07 04:59:15 imp Exp $
  */
 
 #ifndef _DEV_UART_DEV_I8251_H_
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 3956fe71a0c9e..20c6f0c0013ca 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.10.2.2 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_ns8250.h b/sys/dev/uart/uart_dev_ns8250.h
index 85c47229124a4..54426d843b77d 100644
--- a/sys/dev/uart/uart_dev_ns8250.h
+++ b/sys/dev/uart/uart_dev_ns8250.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/uart/uart_dev_ns8250.h,v 1.1 2003/09/06 23:13:47 marcel Exp $
  */
 
 #ifndef _DEV_UART_DEV_NS8250_H_
diff --git a/sys/dev/uart/uart_dev_sab82532.c b/sys/dev/uart/uart_dev_sab82532.c
index 3ce3d01cc8151..9dbf82e714fce 100644
--- a/sys/dev/uart/uart_dev_sab82532.c
+++ b/sys/dev/uart/uart_dev_sab82532.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.7.2.2 2005/02/04 03:35:58 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_sab82532.h b/sys/dev/uart/uart_dev_sab82532.h
index 8b53371972deb..257b5c5c772df 100644
--- a/sys/dev/uart/uart_dev_sab82532.h
+++ b/sys/dev/uart/uart_dev_sab82532.h
@@ -34,7 +34,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_dev_sab82532.h,v 1.1 2003/09/06 23:13:47 marcel Exp $
  */
 
 /*
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index 3710b5200de0e..a5dbcb56bc501 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.8.2.2.2.1 2005/05/01 01:06:40 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_z8530.h b/sys/dev/uart/uart_dev_z8530.h
index 458aff7944c85..844e781ce3c5e 100644
--- a/sys/dev/uart/uart_dev_z8530.h
+++ b/sys/dev/uart/uart_dev_z8530.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/uart/uart_dev_z8530.h,v 1.1 2003/09/06 23:13:47 marcel Exp $
  */
 
 #ifndef _DEV_UART_DEV_Z8530_H_
diff --git a/sys/dev/uart/uart_if.m b/sys/dev/uart/uart_if.m
index 0bb145490ed42..4bc4f143b8f85 100644
--- a/sys/dev/uart/uart_if.m
+++ b/sys/dev/uart/uart_if.m
@@ -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/uart/uart_if.m,v 1.2.4.1 2005/01/30 01:00:08 imp Exp $
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c
index 034965959332e..1cbd0969ec6ae 100644
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.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/uart/uart_kbd_sun.c,v 1.2.2.1 2005/02/09 02:08:20 marcel Exp $
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/uart/uart_kbd_sun.h b/sys/dev/uart/uart_kbd_sun.h
index 603d257432dfa..40957ef542be4 100644
--- a/sys/dev/uart/uart_kbd_sun.h
+++ b/sys/dev/uart/uart_kbd_sun.h
@@ -32,7 +32,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun.h,v 1.1.4.1 2005/01/30 01:00:08 imp Exp $
  */
 
 /* keyboard commands (host->kbd) */
diff --git a/sys/dev/uart/uart_kbd_sun_tables.h b/sys/dev/uart/uart_kbd_sun_tables.h
index e7dc612051043..5a3a0e3d82caa 100644
--- a/sys/dev/uart/uart_kbd_sun_tables.h
+++ b/sys/dev/uart/uart_kbd_sun_tables.h
@@ -2,7 +2,7 @@
  * Automatically generated from sun.us.unix.kbd.
  * DO NOT EDIT!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun_tables.h,v 1.1 2003/11/11 07:33:24 jake Exp $
  */
 static keymap_t keymap_sun_us_unix_kbd = { 0x80, {
 /*                                                         alt
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index 14ce64b1b84fd..2749e4ac62334 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.2.2.2 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index 6888ae0d6ba59..96e7038f1a953 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.16.2.1 2005/01/30 01:00:08 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 338ce6341d54c..17e06e975629a 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.29.2.2 2005/03/03 05:02:14 obrien Exp $");
 
 /*
  * uBsec 5[56]01, 58xx hardware crypto accelerator
diff --git a/sys/dev/ubsec/ubsecreg.h b/sys/dev/ubsec/ubsecreg.h
index 2ba1f937d06e6..a8f6ca5cee8a8 100644
--- a/sys/dev/ubsec/ubsecreg.h
+++ b/sys/dev/ubsec/ubsecreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ubsec/ubsecreg.h,v 1.5.6.1 2005/01/30 01:00:09 imp Exp $ */
 /*	$OpenBSD: ubsecreg.h,v 1.27 2002/09/11 22:40:31 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/ubsec/ubsecvar.h b/sys/dev/ubsec/ubsecvar.h
index 448403b14c01b..b538a1eb1eb11 100644
--- a/sys/dev/ubsec/ubsecvar.h
+++ b/sys/dev/ubsec/ubsecvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ubsec/ubsecvar.h,v 1.7.4.1 2005/01/30 01:00:09 imp Exp $ */
 /*	$OpenBSD: ubsecvar.h,v 1.35 2002/09/24 18:33:26 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/usb/FILES b/sys/dev/usb/FILES
index 09db78cd85225..47c48326130cf 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/FILES,v 1.6 2003/04/14 14:04:07 ticso Exp $
 
 A small roadmap of the USB files:
 
diff --git a/sys/dev/usb/dsbr100io.h b/sys/dev/usb/dsbr100io.h
index 811c3a72b8e27..b385c7b545cac 100644
--- a/sys/dev/usb/dsbr100io.h
+++ b/sys/dev/usb/dsbr100io.h
@@ -28,7 +28,7 @@
  * its contributors.
  */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/dsbr100io.h,v 1.1.10.1 2005/01/30 01:00:09 imp Exp $ */
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/ioccom.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 27680c4837500..a3413a4f7212f 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.14.2.9 2005/03/31 19:47:11 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c
index c6203c30c0cff..2f900ca911566 100644
--- a/sys/dev/usb/ehci_pci.c
+++ b/sys/dev/usb/ehci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.14.2.1 2005/03/31 19:45:09 iedowse Exp $");
 
 /*
  * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
diff --git a/sys/dev/usb/ehcireg.h b/sys/dev/usb/ehcireg.h
index 304b4ae2d92ab..d418a123fd89f 100644
--- a/sys/dev/usb/ehcireg.h
+++ b/sys/dev/usb/ehcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ehcireg.h,v 1.17 2004/06/23 06:45:56 mycroft Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.5.2.2 2005/01/30 01:00:09 imp Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h
index 25597cf843215..07da30e416270 100644
--- a/sys/dev/usb/ehcivar.h
+++ b/sys/dev/usb/ehcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ehcivar.h,v 1.12 2001/12/31 12:16:57 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ehcivar.h,v 1.4.2.4 2005/03/22 00:56:54 iedowse Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index 1c1fcbdbbc9df..df0739cb8c37c 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.23.4.1 2005/01/30 01:00:09 imp Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index a4ab7d2b2969f..9610890c77aaa 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.12.4.1 2005/01/30 01:00:09 imp 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 501d94fa22dd4..57bae3d7f4cca 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.86.2.1 2005/04/01 12:46:25 sobomax Exp $");
 
 /*
  * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.
diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h
index b9e4dd731e799..39074cf142973 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.18.2.2 2005/04/01 12:46:25 sobomax Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 716cc92d2c08c..67614610d3d82 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.22.2.4 2005/04/01 12:46:25 sobomax Exp $");
 
 /*
  * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h
index d825d79533dde..faac369ab8263 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/dev/usb/if_axereg.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_axereg.h,v 1.3.2.3 2005/04/01 12:46:25 sobomax Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index af2d1da57618a..4ef03b3e9af15 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.6.2.1 2005/04/01 12:46:26 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/if_cdcereg.h b/sys/dev/usb/if_cdcereg.h
index 6ac8c21a3cddf..cb13b467a3c94 100644
--- a/sys/dev/usb/if_cdcereg.h
+++ b/sys/dev/usb/if_cdcereg.h
@@ -29,7 +29,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/usb/if_cdcereg.h,v 1.4.2.1 2005/04/01 12:46:26 sobomax Exp $
  */
 
 #ifndef _USB_IF_CDCEREG_H_
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index b0ef7e695c1e0..851f6bf2abc75 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.52.2.2 2005/04/01 12:46:26 sobomax Exp $");
 
 /*
  * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index a3a861df51bc1..da2ce4ed0139c 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.13.2.2 2005/04/01 12:46:26 sobomax Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 7401eb1c8a862..914a8e37b0105 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.58.2.2 2005/04/01 12:46:26 sobomax Exp $");
 
 /*
  * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h
index 298526d3e7c74..2b137a298f5c0 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.14.2.2 2005/04/01 12:46:26 sobomax Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index d5d3a89f56f71..51e9efcd2db14 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.16.2.2 2005/04/01 12:46:26 sobomax Exp $");
 
 /*
  * RealTek RTL8150 USB to fast ethernet controller driver.
diff --git a/sys/dev/usb/if_ruereg.h b/sys/dev/usb/if_ruereg.h
index 206cc7e1e44e8..c4f35baf69b30 100644
--- a/sys/dev/usb/if_ruereg.h
+++ b/sys/dev/usb/if_ruereg.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/usb/if_ruereg.h,v 1.3.2.1 2005/04/01 12:46:26 sobomax Exp $
  */
 
 #ifndef _IF_RUEREG_H_
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 8d744eea7c6bd..5543cf774892b 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.8.2.3 2005/04/01 12:46:26 sobomax Exp $	*/
 /*-
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.8.2.3 2005/04/01 12:46:26 sobomax Exp $");
 
 #include "opt_inet.h"
 #if defined(__NetBSD__)
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index 404c9cb26961b..e8c141b12b5d0 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_udavreg.h,v 1.2.2.2 2005/04/01 12:46:26 sobomax Exp $	*/
 /*-
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
diff --git a/sys/dev/usb/kue_fw.h b/sys/dev/usb/kue_fw.h
index 659dc6bb78f33..722ca4986dfbe 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.2.8.1 2005/01/30 01:00:09 imp Exp $
  */
 
 /*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index c7156534dfa5e..71886201c7a75 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -13,7 +13,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.144.2.4 2005/03/22 00:56:54 iedowse Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index 81a5d9708d63b..70241203fbc61 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.40.2.1 2005/03/03 05:02:15 obrien Exp $");
 
 /*
  * USB Open Host Controller driver.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index c255a4b28f345..fba98c3aec203 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcireg.h,v 1.17 2000/04/01 09:27:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.21.2.1 2005/01/30 01:00:09 imp Exp $	*/
 
 
 /*-
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 928cb52566cbc..4e85bac2bb02b 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcivar.h,v 1.30 2001/12/31 12:20:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.37.2.2 2005/03/22 00:56:54 iedowse Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/rio500_usb.h b/sys/dev/usb/rio500_usb.h
index f2c2081ccc9da..cd48f60cc7809 100644
--- a/sys/dev/usb/rio500_usb.h
+++ b/sys/dev/usb/rio500_usb.h
@@ -20,7 +20,7 @@
 
     ---------------------------------------------------------------------- */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/rio500_usb.h,v 1.1.10.1 2005/01/30 01:00:09 imp Exp $ */
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/ioccom.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 14e8cec8eeaab..67d2c17843154 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.14.2.2 2005/01/30 01:00:09 imp Exp $");
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index fae841b3c9d75..1aa6d650b1381 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.12.2.1 2005/01/30 01:00:09 imp Exp $");
 
 /*
  * BWCT serial adapter driver
diff --git a/sys/dev/usb/ubser.h b/sys/dev/usb/ubser.h
index 45c7ec558eaac..9228a01f214fa 100644
--- a/sys/dev/usb/ubser.h
+++ b/sys/dev/usb/ubser.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/usb/ubser.h,v 1.1.2.1 2005/01/30 01:00:09 imp Exp $
  */
 
 #ifndef UBSER_H
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 44dd458ad236a..e4c9da7827d5c 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.51.2.2.2.1 2005/04/14 20:20:51 iedowse Exp $");
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index 9bddab74cba06..4cddccc525926 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.4.2.1 2005/01/30 01:00:10 imp Exp $	*/
 
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 1ad11bccfb563..ecba59436dd08 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.28.2.1 2005/01/30 01:00:10 imp Exp $");
 
 /* Driver for arbitrary double bulk pipe devices.
  * The driver assumes that there will be the same driver on the other side.
diff --git a/sys/dev/usb/udbp.h b/sys/dev/usb/udbp.h
index 97ef9455b664a..7d1d091b02ba9 100644
--- a/sys/dev/usb/udbp.h
+++ b/sys/dev/usb/udbp.h
@@ -34,7 +34,7 @@
  * This file was derived from src/sys/netgraph/ng_sample.h, revision 1.1
  * written by Julian Elischer, Whistle Communications.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/udbp.h,v 1.3.4.1 2005/01/30 01:00:10 imp Exp $
  */
 
 #ifndef _NETGRAPH_UDBP_H_
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 8439abb2cad2d..38649f887ddcd 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.22.2.1 2005/01/30 01:00:10 imp Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 0cd0991b51c4d..7e9fdfe17dfe0 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.18.2.1 2005/01/30 01:00:10 imp Exp $");
 
 /*
  * FTDI FT8U100AX serial adapter driver
diff --git a/sys/dev/usb/uftdireg.h b/sys/dev/usb/uftdireg.h
index a7c6edcb6005d..11bab9c987749 100644
--- a/sys/dev/usb/uftdireg.h
+++ b/sys/dev/usb/uftdireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uftdireg.h,v 1.2 2004/07/01 17:16:20 brooks Exp $	*/
 
 /*
  * Definitions for the FTDI USB Single Port Serial Converter -
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index cc01b161a0751..229eb7fed96f7 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.88.2.5 2005/01/30 01:00:10 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index 295f2a0db785a..4f696807cbad7 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb/ugraphire_rdesc.h,v 1.1 2000/12/29 01:47:49 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/ugraphire_rdesc.h,v 1.1.10.1 2005/01/30 01:00:10 imp Exp $ */
 /*-
  * Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
  * All rights reserved.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 4340a252340b7..18dd97ec12d95 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.154.2.5 2005/03/22 00:56:54 iedowse Exp $");
 
 
 /*-
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index c92273c590f5a..8bef7b239207a 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.54.2.3 2005/03/03 05:02:15 obrien Exp $");
 
 /* Universal Host Controller Interface
  *
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index 512dd2d7d3c0a..64ad1c0a74743 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcireg.h,v 1.15 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.21.4.1 2005/01/30 01:00:10 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 91766ad3aa0eb..f316619f7f952 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcivar.h,v 1.33 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.37.2.2 2005/03/22 00:56:54 iedowse Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 074e7d1ab0757..17896982adc53 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.73.2.2 2005/01/30 01:00:10 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index d52d7d5b7112e..eb25cc1411b36 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhub.c,v 1.62.2.5 2005/03/31 19:36:59 iedowse Exp $");
 
 /*
  * USB spec: http://www.usb.org/developers/docs/usbspec.zip
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 0748ddb213069..7d5db16f4b9fe 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.49.2.1 2005/01/30 01:00:10 imp Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 9716b65ea9ffc..835517e4d00cd 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.65.2.1 2005/01/30 01:00:10 imp Exp $");
 
 /*
  * Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 8121626bf3fdd..07825f7a74202 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.112.2.6 2005/03/31 19:38:40 iedowse Exp $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 2d42e76b458b5..f26a29d2d3da0 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.8 2004/08/07 23:45:04 sanpei Exp $");
 
 /*
  * Driver for the MCT (Magic Control Technology) USB-RS232 Converter.
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index cedae63423c30..957ac72188ce2 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.53.2.2 2005/02/08 12:44:09 akiyama Exp $");
 /*-
  * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>.
  * All rights reserved.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 3fad1c799b2af..76c4dec7efd28 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.70.2.2 2005/01/30 01:00:10 imp Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 82d8773a99a86..3a672ccb9ccfd 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.20.2.4 2005/02/08 12:44:09 akiyama Exp $");
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 68efc9c19e54d..aefc1d5bce0eb 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.33.2.1 2005/01/30 01:00:10 imp Exp $");
 
 
 /*
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 0931f7af84c34..f5e4a428e4e92 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.100.2.3 2005/03/31 19:33:44 iedowse Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index f4559c1ea6333..f51db3ba9e5ed 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $	*/
-/*	$FreeBSD$    */
+/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.38.8.1 2005/01/30 01:00:10 imp 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 90eff91e51d61..4421d4c239656 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.17.4.2 2005/04/01 12:46:26 sobomax Exp $");
 
 /*
  * Callbacks in the USB code operate at splusb() (actually splbio()
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h
index 5c31ddc2c8097..1532312166c23 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.6.6.2 2005/04/01 12:46:26 sobomax Exp $
  */
 
 #ifndef _USB_ETHERSUBR_H_
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index b04c8a45a4c46..d312ae8ea6e20 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.9.8.1 2005/01/30 01:00:10 imp Exp $
 #
 
 # USB interface description
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index f9a59eb3c6d99..f653031b47952 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.6.2.1 2005/01/30 01:00:10 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.6.2.1 2005/01/30 01:00:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 6fe63f3e3385f..0b98d4a848e32 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.18 2002/05/28 17:45:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.20.4.1 2005/01/30 01:00:10 imp 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 270a2ad1262da..bec20ccd03a54 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
 /*	$NetBSD: usb_port.h,v 1.54 2002/03/28 21:49:19 ichiro Exp $	*/
-/*	$FreeBSD$       */
+/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.67.2.3 2005/01/30 01:00:10 imp Exp $       */
 
 /* Also already merged from NetBSD:
  *	$NetBSD: usb_port.h,v 1.57 2002/09/27 20:42:01 thorpej Exp $
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 4a2e977d6cb50..c5c43b1cbee6b 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.38.2.2 2005/01/30 01:00:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index 4977bf605b404..08135a5836a42 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.20 2001/04/15 09:38:01 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.16.8.1 2005/01/30 01:00:10 imp 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 4dd3a31607a68..89809b3663f26 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.69.2.5 2005/03/02 10:56:51 sobomax Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index 4699559581a50..ee6ec37038996 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbcdc.h,v 1.6 2000/04/27 15:26:50 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.10.6.2 2005/03/02 10:56:52 sobomax Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 1b5597b8ed3f4..08ad3c11bda28 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.195.2.9 2005/04/01 12:46:26 sobomax Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 7bd4f16a1dc10..b6aafcfa53007 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: usbdi.c,v 1.104 2004/07/17 20:16:13 mycroft Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.86.2.4 2005/03/03 01:54:58 iedowse Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 368014d4ce56f..01da43f8594a5 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.50.2.6 2005/04/01 12:46:26 sobomax 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 e1e96cbc7f044..0b04d4121ef82 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.32.2.2 2005/03/02 10:56:52 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index 69d751a9f74ba..cc3fea1aaced0 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.29 2004/06/23 02:30:52 mycroft Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.17.2.2 2005/03/02 10:56:52 sobomax Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 69f236638b1a9..08fc949ecd572 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.41.2.2 2005/01/30 01:00:10 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 8e0ecd5799076..06c5adaae0a4f 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.h,v 1.9 2000/09/03 19:09:14 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.13.8.2 2005/01/30 01:00:10 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index ef8e0a3c2b767..531e6fadab7fc 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.57.2.3 2005/01/30 01:00:10 imp Exp $");
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index fcce250575435..1f8767706ffa6 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $	*/
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.22.2.1 2005/01/30 01:00:10 imp Exp $	*/
 
 /* Also already merged from NetBSD:
  *	$NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index fbff688c5c9a6..dff9f727a6faa 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uvscom.c,v 1.23.2.1 2005/02/08 12:44:09 akiyama Exp $");
 
 /*
  * uvscom: SUNTAC Slipper U VS-10U driver.
diff --git a/sys/dev/utopia/idtphy.h b/sys/dev/utopia/idtphy.h
index 1451d0561fa3a..ae949dfb45f6a 100644
--- a/sys/dev/utopia/idtphy.h
+++ b/sys/dev/utopia/idtphy.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/idtphy.h,v 1.2.4.1 2005/01/30 01:00:11 imp Exp $
  *
  * Register definitions for the following chips:
  *	IDT 77105
diff --git a/sys/dev/utopia/suni.h b/sys/dev/utopia/suni.h
index fd1be7e13e39b..4d9847c1f5e2d 100644
--- a/sys/dev/utopia/suni.h
+++ b/sys/dev/utopia/suni.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/suni.h,v 1.1.4.1 2005/01/30 01:00:11 imp Exp $
  *
  * Register definitions for the following chips:
  *	PMC-Sierra PMC-5346 (S/UNI-LITE)
diff --git a/sys/dev/utopia/utopia.c b/sys/dev/utopia/utopia.c
index e4a7c01b358f9..e69d0406e4377 100644
--- a/sys/dev/utopia/utopia.c
+++ b/sys/dev/utopia/utopia.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/utopia.c,v 1.7.2.1 2005/01/30 01:00:11 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/utopia.h b/sys/dev/utopia/utopia.h
index 0c95aa344d4f5..bdfd3401b6528 100644
--- a/sys/dev/utopia/utopia.h
+++ b/sys/dev/utopia/utopia.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/utopia.h,v 1.3.4.1 2005/01/30 01:00:11 imp Exp $
  */
 #ifndef _DEV_UTOPIA_UTOPIA_H
 #define	_DEV_UTOPIA_UTOPIA_H
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 487490c7d6f8b..f52e29f68b01f 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.3.2.3 2005/03/03 05:02:15 obrien Exp $");
 
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index 8d11a9c3e1f64..74799764a8cfc 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.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/vge/if_vgereg.h,v 1.1.2.2 2005/01/30 01:00:12 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index f8003744a7cb1..196d6e86148e3 100644
--- a/sys/dev/vge/if_vgevar.h
+++ b/sys/dev/vge/if_vgevar.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/vge/if_vgevar.h,v 1.1.2.2 2005/01/30 01:00:12 imp Exp $
  */
 
 #if !defined(__i386__)
diff --git a/sys/dev/vinum/COPYRIGHT b/sys/dev/vinum/COPYRIGHT
index f0295e6a6d0e2..aafb761a30c0a 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 c5a7da2ba2118..fc736be4df7c8 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 600130f4e2933..3d985cd0fe5f4 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.22 2003/04/24 04:37:08 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/request.h,v 1.21 2003/05/01 13:06:00 grog Exp $
  */
 
 /* Information needed to set up a transfer */
diff --git a/sys/dev/vinum/statetexts.h b/sys/dev/vinum/statetexts.h
index 88cfc17d0309d..921c743632231 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 5fb990d8a207c..b6e27b2df9273 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinum.c,v 1.66 2004/07/15 08:26:04 phk Exp $");
 
 #define STATIC static					    /* nothing while we're testing */
 
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 989af88889241..91274ed6f5b50 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.67 2004/06/17 17:16:46 phk Exp $");
 
 #define STATIC static
 
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 121357de6654e..1103ee404953e 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -1,7 +1,7 @@
 /* daemon.c: kernel part of Vinum daemon */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumdaemon.c,v 1.26 2003/08/24 17:55:56 obrien Exp $");
 /*-
  * Copyright (c) 1997, 1998
  *	Nan Yang Computer Services Limited.  All rights reserved.
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index ed2e6a51c0cfb..7d5aa37e5232c 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.33 2003/05/23 00:57:48 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.42.2.1 2004/09/24 22:40:01 marius Exp $
  */
 
 /* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 41178212420ea..8f25bf1a29606 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.19 2001/05/22 04:07:22 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.31 2004/07/10 21:17:04 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index d031ef938fb44..0c3778db2d5c3 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -1,7 +1,7 @@
 /* vinuminterrupt.c: bottom half of the driver */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.44 2004/07/10 21:17:04 marcel Exp $");
 
 /*-
  * Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 1dd8df98bab62..58a108e29cd50 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.39 2003/05/23 00:59:53 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.100.2.1 2004/11/29 23:40:17 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index bf5134a64f909..6e530c9005883 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.23 2003/05/04 05:25:46 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.h,v 1.23 2003/06/12 05:32:31 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 235b125d7e6ff..70b919fb03b0f 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.51 2004/07/10 21:17:04 marcel Exp $");
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Nan Yang Computer Services Limited.  All rights reserved.
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index d7bc7a5b4bf8a..d4501e412f8a3 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -30,7 +30,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumkw.h,v 1.20 2003/05/07 03:32:09 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumkw.h,v 1.23 2003/06/12 05:45:19 grog Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index f1a2ea3103e20..2a01694ef4981 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.27 2003/08/24 17:55:56 obrien Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 43e19379f4b58..dd11103a6ffd1 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.35.2.1 2004/09/24 22:40:01 marius Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 
diff --git a/sys/dev/vinum/vinumobj.h b/sys/dev/vinum/vinumobj.h
index d6a4d873d2252..9f0530389cd2c 100644
--- a/sys/dev/vinum/vinumobj.h
+++ b/sys/dev/vinum/vinumobj.h
@@ -38,7 +38,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumobj.h,v 1.7 2003/05/23 01:08:58 grog Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumobj.h,v 1.11 2004/06/16 09:47:02 phk Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 49da34b4dec34..18e8bdeeb5ab8 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumparser.c,v 1.33 2003/08/24 17:55:56 obrien Exp $");
 
 /*
  * This file contains the parser for the configuration routines.  It's used
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index 4bdd64f4c7f87..f21db91e701f2 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumraid5.c,v 1.14 2003/08/24 17:55:56 obrien Exp $");
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <sys/resourcevar.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 0915f8cb46930..0fbb944fd6fc1 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.73 2004/03/19 10:28:34 le Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 59a91a9bc01a6..f29b54bbc3b86 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.45 2003/12/15 00:45:53 grog Exp $");
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 94b45c1507def..47d3c602fb93b 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumstate.c,v 1.34 2003/08/24 17:55:57 obrien Exp $");
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index 572f317d03dca..beef6aae3b0ba 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 f63bbd7f308f1..1b3eccba19fbc 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.19 2004/06/16 09:47:02 phk Exp $");
 
 /* This file contains utility routines used both in kernel and user context */
 
diff --git a/sys/dev/vinum/vinumutil.h b/sys/dev/vinum/vinumutil.h
index 2efa42c225590..d723fb7cd076f 100644
--- a/sys/dev/vinum/vinumutil.h
+++ b/sys/dev/vinum/vinumutil.h
@@ -36,7 +36,7 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumutil.h,v 1.1 2001/05/22 04:07:22 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumutil.h,v 1.1 2001/05/22 22:29:35 grog Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 8e7edd8306684..cbf62b9982c90 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.33 2003/05/23 01:09:23 grog Exp grog $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.49 2004/03/19 10:28:34 le Exp $
  */
 
 #include <sys/time.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index d2d7b25df2784..24c94ecc30fc7 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.51.2.1 2005/01/30 01:00:12 imp Exp $");
 
 /*
  * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index e53b0ced790b4..d43924ac29392 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.22.2.1 2005/01/30 01:00:12 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 3f94917cbaa91..deaf37336f31d 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.30.2.1 2005/01/30 01:00:12 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h
index eec14edbf9270..7a72ad5487294 100644
--- a/sys/dev/vx/if_vxreg.h
+++ b/sys/dev/vx/if_vxreg.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/vx/if_vxreg.h,v 1.11.4.1 2005/01/30 01:00:12 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index c532d6fba504f..f751724adf3c1 100644
--- a/sys/dev/vx/if_vxvar.h
+++ b/sys/dev/vx/if_vxvar.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/vx/if_vxvar.h,v 1.2.4.1 2005/01/30 01:00:12 imp Exp $
  *
  October 2, 1994
 
diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c
index 782388588089c..2a49a7ff75d2b 100644
--- a/sys/dev/watchdog/watchdog.c
+++ b/sys/dev/watchdog/watchdog.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/watchdog/watchdog.c,v 1.2 2004/06/16 09:47:02 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index 384dd08be1c3d..710f351f1b626 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wds/wd7000.c,v 1.8.4.1 2005/01/30 01:00:12 imp Exp $");
 
 /* All bugs are subject to removal without further notice */
 
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index 585edaa237fac..e52a03ce22b6b 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_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/wi/if_wavelan_ieee.h,v 1.18.4.1 2005/01/30 01:00:12 imp Exp $
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 8dd7a25d729ed..c9e6b749cdd82 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.168.2.1 2005/01/30 01:00:12 imp Exp $");
 
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index bb776ff573cc1..edeb5f1000c3b 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.47.2.2 2005/02/02 22:54:18 imp Exp $");
 
 #include "opt_wi.h"
 
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index 64cfd1e0ad96b..7560f60a2e4a2 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_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/wi/if_wi_pci.c,v 1.22.2.1 2005/01/30 01:00:12 imp Exp $
  */
 
 /*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 7992f891c4814..3f96bf6e8f4da 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.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/wi/if_wireg.h,v 1.43.2.1 2005/01/30 01:00:12 imp Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index e97d31d9183d8..3e4e065a3ff23 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -31,7 +31,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/wi/if_wivar.h,v 1.22.2.1 2005/01/30 01:00:12 imp Exp $
  */
 
 #if 0
diff --git a/sys/dev/wi/spectrum24t_cf.h b/sys/dev/wi/spectrum24t_cf.h
index ce053fa1930c2..804cad6494cb0 100644
--- a/sys/dev/wi/spectrum24t_cf.h
+++ b/sys/dev/wi/spectrum24t_cf.h
@@ -1,5 +1,5 @@
 /*	$NetBSD$	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/wi/spectrum24t_cf.h,v 1.1.8.1 2005/01/30 01:00:13 imp Exp $ */
 
 /*-
  * Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 113a985d4a75a..77c7b683a2ce7 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -173,7 +173,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.63.2.1 2005/01/30 01:00:13 imp Exp $");
 
 
 /*
diff --git a/sys/dev/wl/if_wl.h b/sys/dev/wl/if_wl.h
index e883b782b0463..ed9edbc6bde2a 100644
--- a/sys/dev/wl/if_wl.h
+++ b/sys/dev/wl/if_wl.h
@@ -18,7 +18,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/wl/if_wl.h,v 1.6.6.1 2005/01/30 01:00:13 imp Exp $
  */
 /* Definitions for WaveLAN driver */
 
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index a1db1029a61ec..79e3a4fe80715 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.52.2.1 2005/01/30 01:00:13 imp Exp $");
 
 /*		
  * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters.  The
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index 8d9f7672b7fca..75384975eb900 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe_pccard.c,v 1.21.2.1 2005/01/30 01:00:13 imp Exp $");
 
 /* xe pccard interface driver */
 
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index 9b3c39a611a05..80c07fc4bcb5d 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.6 2003/10/14 22:51:35 rsm 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 041588167e4c3..0aff611d30dfd 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.5 2004/04/09 17:27:36 rsm Exp $
  */
 #ifndef DEV_XE_IF_XEDEV_H
 #define DEV_XE_IF_XEDEV_H
diff --git a/sys/dev/zs/z8530reg.h b/sys/dev/zs/z8530reg.h
index b471c9c4deb50..877bd5bde66ae 100644
--- a/sys/dev/zs/z8530reg.h
+++ b/sys/dev/zs/z8530reg.h
@@ -39,7 +39,7 @@
  *
  *	@(#)zsreg.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/zs/z8530reg.h,v 1.3.2.1 2005/01/30 01:00:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/zs/z8530var.h b/sys/dev/zs/z8530var.h
index 1e5fef7d32828..9da92d6b6c6a0 100644
--- a/sys/dev/zs/z8530var.h
+++ b/sys/dev/zs/z8530var.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/zs/z8530var.h,v 1.2 2004/06/16 09:47:02 phk Exp $
  */
 
 #ifndef _DEV_ZS_ZSVAR_H_
diff --git a/sys/dev/zs/zs.c b/sys/dev/zs/zs.c
index ab13d09e2252a..8050634e14a73 100644
--- a/sys/dev/zs/zs.c
+++ b/sys/dev/zs/zs.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.26 2004/07/15 20:47:40 phk Exp $");
 /*-
  * Copyright (c) 2003 Jake Burkholder.
  * All rights reserved.
diff --git a/sys/dev/zs/zs_macio.c b/sys/dev/zs/zs_macio.c
index 3879a9edf5d13..b483dd8cc5c63 100644
--- a/sys/dev/zs/zs_macio.c
+++ b/sys/dev/zs/zs_macio.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs_macio.c,v 1.6 2004/08/12 17:41:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/zs/zs_sbus.c b/sys/dev/zs/zs_sbus.c
index 40b7ea4fd0748..a342258361f7e 100644
--- a/sys/dev/zs/zs_sbus.c
+++ b/sys/dev/zs/zs_sbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs_sbus.c,v 1.8 2004/08/12 17:41:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
author	cvs2svn <cvs2svn@FreeBSD.org>	2005-05-07 17:51:10 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	2005-05-07 17:51:10 +0000
commit	e87a6b5d6805bf9f3f9faf53db0ba96345ef0f77 (patch)
tree	5d7f179f3d81639a2b00e739c98d784b98e1bfae /sys/dev
parent	bbe327aea67f046183f949450d6271765b9ebfb0 (diff)