upstream/2.0.5_cvsrelease/2.0.5_cvs

949 files changed, 1279 insertions, 1752 deletions

diff --git a/sys/Makefile b/sys/Makefile
index 00d80648ef6d..26cc6758d9f9 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1994/08/02 07:38:17 davidg Exp $
+#	Makefile,v 1.3 1994/08/25 13:54:28 paul Exp
 
 SUBDIR=	${MACHINE}/boot libkern
 
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index aac4bd353fbc..215295288a33 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,10 +32,10 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $Id: newvers.sh,v 1.15 1995/04/22 21:39:15 phk Exp $
+# newvers.sh,v 1.16 1995/05/02 22:20:03 phk Exp
 
 TYPE="FreeBSD"
-RELEASE="2.0-CURRENT"
+RELEASE=2.0.5-RELEASE
 RELDATE="199504"
 
 if [ "x$RELEASE" = x2.0-CURRENT ] ; then
diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 80cb84a3734f..7d2a13a6997a 100644
--- a/sys/conf/nfsswapkernel.c
+++ b/sys/conf/nfsswapkernel.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $Id: nfsswapvmunix.c,v 1.2 1994/08/02 07:38:29 davidg Exp $
+ * nfsswapkernel.c,v 1.1 1994/08/05 09:25:31 davidg Exp
  */
 
 /*
diff --git a/sys/conf/param.c b/sys/conf/param.c
index aef43749c65a..b57cadcc136a 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.8 1995/02/20 19:42:19 guido Exp $
+ * param.c,v 1.9 1995/05/25 07:36:24 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index 4cda02af41d8..8a69e9ca47b6 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -38,7 +38,7 @@
 #
 # First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory.
 #
-# $Id$
+# systags.sh,v 1.2 1994/08/02 07:38:32 davidg Exp
 
 rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
 MACHINE=`machine`
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index fb53d27f5f12..9df69b2d6b0f 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_access.c,v 1.6 1994/08/18 22:34:18 wollman Exp $
+ *	db_access.c,v 1.7 1995/05/30 07:56:46 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index dbf3d2112115..fbab990c35ca 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_access.h,v 1.3 1993/11/07 17:39:20 wollman Exp $
+ *	db_access.h,v 1.4 1995/05/30 07:56:47 rgrimes Exp
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 62cbba94b653..c1fb4dc72a63 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_aout.c,v 1.10 1995/01/25 21:37:04 bde Exp $
+ *	db_aout.c,v 1.11 1995/05/30 07:56:49 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 05a4cc16a93c..a7eee0b39fa8 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.c,v 1.5 1994/08/18 22:34:19 wollman Exp $
+ *	db_break.c,v 1.6 1995/05/30 07:56:50 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index efe62c717e29..7a7bf714660f 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.h,v 1.2 1993/10/16 16:47:09 rgrimes Exp $
+ *	db_break.h,v 1.3 1995/05/30 07:56:51 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index c52238ad6116..105101a1f322 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.12 1995/03/19 14:28:28 davidg Exp $
+ *	db_command.c,v 1.13 1995/05/30 07:56:52 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 3b6d77ae7102..14229d95a4bb 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.h,v 1.5 1994/08/18 22:34:21 wollman Exp $
+ *	db_command.h,v 1.6 1995/05/30 07:56:54 rgrimes Exp
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 8f321b936c85..09d20c818908 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_examine.c,v 1.7 1995/05/22 13:07:11 davidg Exp $
+ *	db_examine.c,v 1.8 1995/05/30 07:56:55 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 8f4b78f99def..0f1338c04d72 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_expr.c,v 1.4 1994/08/13 03:49:18 wollman Exp $
+ *	db_expr.c,v 1.5 1995/05/30 07:56:56 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index c3097742eb9f..6922fe5b23de 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_input.c,v 1.6 1994/08/18 22:34:23 wollman Exp $
+ *	db_input.c,v 1.7 1995/05/30 07:56:58 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 3985c4f67e34..af157ee0ce04 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.c,v 1.5 1994/08/18 22:34:23 wollman Exp $
+ *	db_lex.c,v 1.6 1995/05/30 07:57:00 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 0be7d4ac4a18..f0bd68209001 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.h,v 1.4 1994/08/18 22:34:24 wollman Exp $
+ *	db_lex.h,v 1.5 1995/05/30 07:57:01 rgrimes Exp
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index ca92bfc912de..8125d57c129d 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.c,v 1.10 1994/10/30 20:55:44 bde Exp $
+ *	db_output.c,v 1.11 1995/05/30 07:57:02 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 3a2f5fd321a9..bd209842716a 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.h,v 1.6 1994/09/27 12:15:53 davidg Exp $
+ *	db_output.h,v 1.7 1995/05/30 07:57:04 rgrimes Exp
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 7f0557b5c771..4e521333b4c6 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_print.c,v 1.6 1994/09/27 03:34:56 phk Exp $
+ *	db_print.c,v 1.7 1995/05/30 07:57:06 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 09af7f0787ac..98f1803f53ee 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: db_ps.c,v 1.5 1995/04/04 01:35:33 davidg Exp $
+ *	db_ps.c,v 1.6 1995/05/30 07:57:07 rgrimes Exp
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index e161a73228ce..dcc4b67fb504 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_run.c,v 1.4 1994/08/13 03:49:22 wollman Exp $
+ *	db_run.c,v 1.5 1995/05/30 07:57:08 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 81c7b4d94a80..89d9939389e6 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.c,v 1.8 1995/05/22 13:07:12 davidg Exp $
+ *	db_sym.c,v 1.9 1995/05/30 07:57:10 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 319279dab56b..0396f576dcce 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.h,v 1.7 1995/03/16 18:11:00 bde Exp $
+ *	db_sym.h,v 1.8 1995/05/30 07:57:11 rgrimes Exp
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 83419b825537..08d5d79b5f3e 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trap.c,v 1.6 1994/10/02 19:36:21 phk Exp $
+ *	db_trap.c,v 1.7 1995/05/30 07:57:14 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 25485f5256c2..1e4be3ae6db2 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.c,v 1.6 1994/09/27 03:34:58 phk Exp $
+ *	db_variables.c,v 1.7 1995/05/30 07:57:17 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 76aeedecaf62..1468a10166a8 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.h,v 1.3 1993/11/25 01:30:14 wollman Exp $
+ *	db_variables.h,v 1.4 1995/05/30 07:57:19 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index b74fab9e9fa6..abf70ba9fb40 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_watch.c,v 1.5 1994/08/18 22:34:28 wollman Exp $
+ *	db_watch.c,v 1.6 1995/05/30 07:57:20 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 61cb7c1806bb..4d62c7d81042 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_watch.h,v 1.3 1994/08/18 22:34:29 wollman Exp $
+ *	db_watch.h,v 1.4 1995/05/30 07:57:21 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 1b2a99e42c1f..21a9584682a8 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_write_cmd.c,v 1.4 1994/08/13 03:49:26 wollman Exp $
+ *	db_write_cmd.c,v 1.5 1995/05/30 07:57:23 rgrimes Exp
  */
 
 /*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 23702b28cb7f..4e35a2548cfd 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ddb.h,v 1.5 1995/03/16 18:11:01 bde Exp $
+ *	ddb.h,v 1.6 1995/05/30 07:57:24 rgrimes Exp
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index e8cc5bb6a152..6c6f20512c1c 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -41,7 +41,7 @@
 #
 ##-M#########################################################################
 
-VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.15 1995/04/27 17:44:27 gibbs Exp $"
+VERSION AIC7XXX_SEQ_VER "aic7xxx.seq,v 1.16 1995/05/17 07:05:49 davidg Exp"
 
 SCBMASK		= 0x1f
 
diff --git a/sys/dev/aic7xxx/aic7xxx_asm.c b/sys/dev/aic7xxx/aic7xxx_asm.c
index e2745f094023..d99986a21588 100644
--- a/sys/dev/aic7xxx/aic7xxx_asm.c
+++ b/sys/dev/aic7xxx/aic7xxx_asm.c
@@ -43,7 +43,7 @@
  * are token separators.
  *
  *-M*************************************************************************/
-static char id[] = "$Id: aic7xxx_asm.c,v 1.8 1995/04/15 21:45:56 gibbs Exp $";
+static char id[] = "aic7xxx_asm.c,v 1.9 1995/05/30 07:57:33 rgrimes Exp";
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h
index 0e799c568f03..20449b467fd3 100644
--- a/sys/gnu/i386/fpemul/control_w.h
+++ b/sys/gnu/i386/fpemul/control_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *        $Id: control_w.h,v 1.3 1994/06/10 07:44:07 rich Exp $
+ *        control_w.h,v 1.4 1995/05/30 07:57:41 rgrimes Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s
index d25313b3792c..3d4a906035fb 100644
--- a/sys/gnu/i386/fpemul/div_small.s
+++ b/sys/gnu/i386/fpemul/div_small.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- *     $Id: div_small.s,v 1.2 1994/04/29 21:07:11 gclarkii Exp $
+ *     div_small.s,v 1.3 1994/06/10 07:44:08 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index a303b3416f84..49463d0235e8 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: errors.c,v 1.3 1994/06/10 07:44:10 rich Exp $
+ *    errors.c,v 1.4 1995/03/16 18:11:10 bde Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h
index 11f9d02160d8..89a078fe818a 100644
--- a/sys/gnu/i386/fpemul/exception.h
+++ b/sys/gnu/i386/fpemul/exception.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: exception.h,v 1.2 1994/04/29 21:07:13 gclarkii Exp $
+ *    exception.h,v 1.3 1994/06/10 07:44:12 rich Exp
  *
  *
  */
diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c
index 5745e1b32d17..5bf915861c4b 100644
--- a/sys/gnu/i386/fpemul/fpu_arith.c
+++ b/sys/gnu/i386/fpemul/fpu_arith.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_arith.c,v 1.3 1994/06/10 07:44:14 rich Exp $
+ *     fpu_arith.c,v 1.4 1995/05/30 07:57:43 rgrimes Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h
index e618c04e1f35..aec6b06dbfe2 100644
--- a/sys/gnu/i386/fpemul/fpu_asm.h
+++ b/sys/gnu/i386/fpemul/fpu_asm.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_asm.h,v 1.2 1994/04/29 21:07:14 gclarkii Exp $
+ *    fpu_asm.h,v 1.3 1994/06/10 07:44:16 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c
index 629e45a79472..7766c212f095 100644
--- a/sys/gnu/i386/fpemul/fpu_aux.c
+++ b/sys/gnu/i386/fpemul/fpu_aux.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_aux.c,v 1.2 1994/04/29 21:16:19 gclarkii Exp $
+ *     fpu_aux.c,v 1.3 1994/06/10 07:44:17 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h
index b62a9cf89476..2dcf256bd75f 100644
--- a/sys/gnu/i386/fpemul/fpu_emu.h
+++ b/sys/gnu/i386/fpemul/fpu_emu.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_emu.h,v 1.2 1994/04/29 21:16:20 gclarkii Exp $
+ *     fpu_emu.h,v 1.3 1994/06/10 07:44:19 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index edbe94d6aeea..1e5e44c087ed 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
  *
  * W. Metzenthen   June 1994.
  *
- *  $Id: fpu_entry.c,v 1.5 1994/08/30 20:18:52 davidg Exp $
+ *  fpu_entry.c,v 1.6 1995/05/30 07:57:45 rgrimes Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c
index 936e39a8b8bb..ff7f3debe0a6 100644
--- a/sys/gnu/i386/fpemul/fpu_etc.c
+++ b/sys/gnu/i386/fpemul/fpu_etc.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_etc.c,v 1.2 1994/04/29 21:16:22 gclarkii Exp $
+ *    fpu_etc.c,v 1.3 1994/06/10 07:44:24 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index c15c913899fb..dcd618c34bde 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id: fpu_proto.h,v 1.2 1994/04/29 21:16:23 gclarkii Exp $
+ *    fpu_proto.h,v 1.3 1995/03/16 18:11:11 bde Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h
index bb9e5d04fdb4..3cb36dbcf75d 100644
--- a/sys/gnu/i386/fpemul/fpu_system.h
+++ b/sys/gnu/i386/fpemul/fpu_system.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_system.h,v 1.3 1994/06/10 07:44:25 rich Exp $
+ *    fpu_system.h,v 1.4 1995/05/30 07:57:51 rgrimes Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index ca32f91d0aef..5d32b5e1f089 100644
--- a/sys/gnu/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/i386/fpemul/fpu_trig.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_trig.c,v 1.3 1994/04/29 21:16:25 gclarkii Exp $
+ *    fpu_trig.c,v 1.4 1994/06/10 07:44:27 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c
index 5839e57c2684..d838242ad458 100644
--- a/sys/gnu/i386/fpemul/get_address.c
+++ b/sys/gnu/i386/fpemul/get_address.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: get_address.c,v 1.2 1994/04/29 21:16:26 gclarkii Exp $
+ *     get_address.c,v 1.3 1994/06/10 07:44:29 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index e45b67ecefd8..286f1cddd09a 100644
--- a/sys/gnu/i386/fpemul/load_store.c
+++ b/sys/gnu/i386/fpemul/load_store.c
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: load_store.c,v 1.3 1994/06/10 07:44:30 rich Exp $
+ *    load_store.c,v 1.4 1994/09/21 22:22:46 bde Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h
index 4dc90b83a984..f38b42d22723 100644
--- a/sys/gnu/i386/fpemul/math_emu.h
+++ b/sys/gnu/i386/fpemul/math_emu.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id:$
+ *    math_emu.h,v 1.2 1994/04/29 21:23:24 gclarkii Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c
index b7e81f241f1c..72a5eec8c600 100644
--- a/sys/gnu/i386/fpemul/poly_2xm1.c
+++ b/sys/gnu/i386/fpemul/poly_2xm1.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *   $Id: poly_2xm1.c,v 1.2 1994/04/29 21:23:25 gclarkii Exp $
+ *   poly_2xm1.c,v 1.3 1994/06/10 07:44:32 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c
index 179049fcfb10..0a971adc6a25 100644
--- a/sys/gnu/i386/fpemul/poly_atan.c
+++ b/sys/gnu/i386/fpemul/poly_atan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: poly_atan.c,v 1.3 1994/04/29 21:23:26 gclarkii Exp $
+ *    poly_atan.c,v 1.4 1994/06/10 07:44:34 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s
index 3ac5bf06fe1b..31914e0c35f0 100644
--- a/sys/gnu/i386/fpemul/poly_div.s
+++ b/sys/gnu/i386/fpemul/poly_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_div.s,v 1.2 1994/04/29 21:23:27 gclarkii Exp $
+ *     poly_div.s,v 1.3 1994/06/10 07:44:36 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c
index 0607c1609d28..0a4074a485c9 100644
--- a/sys/gnu/i386/fpemul/poly_l2.c
+++ b/sys/gnu/i386/fpemul/poly_l2.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_l2.c,v 1.4 1994/04/30 16:47:08 gclarkii Exp $
+ *     poly_l2.c,v 1.5 1994/06/10 07:44:38 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s
index c0f5d0fc5ba9..4cd2575aa31a 100644
--- a/sys/gnu/i386/fpemul/poly_mul64.s
+++ b/sys/gnu/i386/fpemul/poly_mul64.s
@@ -59,7 +59,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: poly_mul64.s,v 1.2 1994/04/29 21:23:29 gclarkii Exp $
+ *    poly_mul64.s,v 1.3 1994/06/10 07:44:39 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c
index a1aa11c1ca66..11f60b4f6666 100644
--- a/sys/gnu/i386/fpemul/poly_sin.c
+++ b/sys/gnu/i386/fpemul/poly_sin.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_sin.c,v 1.4 1994/06/10 07:44:41 rich Exp $
+ *     poly_sin.c,v 1.5 1994/08/31 04:45:22 davidg Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c
index 6098c814b42f..2afa6273c8ab 100644
--- a/sys/gnu/i386/fpemul/poly_tan.c
+++ b/sys/gnu/i386/fpemul/poly_tan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *      $Id: poly_tan.c,v 1.4 1994/06/10 07:44:42 rich Exp $
+ *      poly_tan.c,v 1.5 1995/05/30 07:57:52 rgrimes Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s
index f54c729fe6fd..2b56303fbd87 100644
--- a/sys/gnu/i386/fpemul/polynomial.s
+++ b/sys/gnu/i386/fpemul/polynomial.s
@@ -64,7 +64,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: polynomial.s,v 1.2 1994/04/29 21:23:31 gclarkii Exp $
+ *     polynomial.s,v 1.3 1994/06/10 07:44:43 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c
index a122452f19f9..02d87dd61662 100644
--- a/sys/gnu/i386/fpemul/reg_add_sub.c
+++ b/sys/gnu/i386/fpemul/reg_add_sub.c
@@ -55,7 +55,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_add_sub.c,v 1.2 1994/04/29 21:30:15 gclarkii Exp $
+ *     reg_add_sub.c,v 1.3 1994/06/10 07:44:44 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c
index 52623f72711a..b8c9f0ad405a 100644
--- a/sys/gnu/i386/fpemul/reg_compare.c
+++ b/sys/gnu/i386/fpemul/reg_compare.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_compare.c,v 1.4 1994/08/31 04:45:23 davidg Exp $
+ *     reg_compare.c,v 1.5 1995/05/30 07:57:54 rgrimes Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h
index 6e4ffa86d78e..49f2dd708ecd 100644
--- a/sys/gnu/i386/fpemul/reg_constant.h
+++ b/sys/gnu/i386/fpemul/reg_constant.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: reg_constant.h,v 1.2 1994/04/29 21:30:18 gclarkii Exp $
+ *    reg_constant.h,v 1.3 1994/06/10 07:44:49 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s
index 5de5a466c49f..0d415276e0b4 100644
--- a/sys/gnu/i386/fpemul/reg_div.s
+++ b/sys/gnu/i386/fpemul/reg_div.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- *      $Id: reg_div.s,v 1.2 1994/04/29 21:30:19 gclarkii Exp $
+ *      reg_div.s,v 1.3 1994/06/10 07:44:50 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index 8fde12fd18d4..39142df0e9ee 100644
--- a/sys/gnu/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/i386/fpemul/reg_ld_str.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_ld_str.c,v 1.4 1994/08/31 04:45:24 davidg Exp $
+ *     reg_ld_str.c,v 1.5 1994/09/21 22:22:48 bde Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c
index b51e9fcf2ed7..d16f0d73e2cc 100644
--- a/sys/gnu/i386/fpemul/reg_mul.c
+++ b/sys/gnu/i386/fpemul/reg_mul.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_mul.c,v 1.2 1994/04/29 21:30:21 gclarkii Exp $
+ *     reg_mul.c,v 1.3 1994/06/10 07:44:53 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s
index 6f9dd7c9693a..b8b7eadf7c89 100644
--- a/sys/gnu/i386/fpemul/reg_norm.s
+++ b/sys/gnu/i386/fpemul/reg_norm.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_norm.s,v 1.2 1994/04/29 21:30:22 gclarkii Exp $
+ *     reg_norm.s,v 1.3 1994/06/10 07:44:54 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s
index 99a2a8aa352e..e908c02d8dd7 100644
--- a/sys/gnu/i386/fpemul/reg_round.s
+++ b/sys/gnu/i386/fpemul/reg_round.s
@@ -65,7 +65,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_round.s,v 1.2 1994/04/29 21:30:23 gclarkii Exp $
+ *     reg_round.s,v 1.3 1994/06/10 07:44:55 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s
index 86c84753e679..8ee21ba9c4e0 100644
--- a/sys/gnu/i386/fpemul/reg_u_add.s
+++ b/sys/gnu/i386/fpemul/reg_u_add.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_add.s,v 1.2 1994/04/29 21:34:23 gclarkii Exp $
+ *     reg_u_add.s,v 1.3 1994/06/10 07:44:56 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s
index 4952923886a2..dfb9c6c91405 100644
--- a/sys/gnu/i386/fpemul/reg_u_div.s
+++ b/sys/gnu/i386/fpemul/reg_u_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *      $Id: reg_u_div.s,v 1.2 1994/04/29 21:34:24 gclarkii Exp $
+ *      reg_u_div.s,v 1.3 1994/06/10 07:44:57 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s
index 798f2046c8eb..9802db554c20 100644
--- a/sys/gnu/i386/fpemul/reg_u_mul.s
+++ b/sys/gnu/i386/fpemul/reg_u_mul.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_mul.s,v 1.2 1994/04/29 21:34:25 gclarkii Exp $
+ *     reg_u_mul.s,v 1.3 1994/06/10 07:44:58 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s
index 3161e190284b..4073eb3a8926 100644
--- a/sys/gnu/i386/fpemul/reg_u_sub.s
+++ b/sys/gnu/i386/fpemul/reg_u_sub.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_sub.s,v 1.2 1994/04/29 21:34:26 gclarkii Exp $
+ *     reg_u_sub.s,v 1.3 1994/06/10 07:44:59 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h
index 75b87b4757d1..aef9c7ef33fd 100644
--- a/sys/gnu/i386/fpemul/status_w.h
+++ b/sys/gnu/i386/fpemul/status_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: status_w.h,v 1.2 1994/04/29 21:34:27 gclarkii Exp $
+ *    status_w.h,v 1.3 1994/06/10 07:45:01 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h
index 9c08aeda7e2f..021524a3ee88 100644
--- a/sys/gnu/i386/fpemul/version.h
+++ b/sys/gnu/i386/fpemul/version.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: version.h,v 1.2 1994/04/29 21:34:28 gclarkii Exp $
+ *    version.h,v 1.3 1994/06/10 07:45:02 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s
index 9de946448597..29f6a6308f4b 100644
--- a/sys/gnu/i386/fpemul/wm_shrx.s
+++ b/sys/gnu/i386/fpemul/wm_shrx.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: wm_shrx.s,v 1.2 1994/04/29 21:34:29 gclarkii Exp $
+ *     wm_shrx.s,v 1.3 1994/06/10 07:45:03 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s
index b1bc03b2a933..2e3bc51a4a21 100644
--- a/sys/gnu/i386/fpemul/wm_sqrt.s
+++ b/sys/gnu/i386/fpemul/wm_sqrt.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: wm_sqrt.s,v 1.2 1994/04/29 21:34:30 gclarkii Exp $
+ *     wm_sqrt.s,v 1.3 1994/06/10 07:45:04 rich Exp
  *
  */
 
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index 03f8b58dfaea..9211f25e4b37 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.5 1995/05/11 19:25:55 rgrimes Exp $";
+static char     nic38_id[] = "@(#)nic3008.c,v 1.6 1995/05/30 07:57:57 rgrimes Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
+ *  II - Version 0.1 1.6   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,10 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.5 1995/05/11 19:25:55 rgrim
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: nic3008.c,v $
+ * nic3008.c,v
+ * Revision 1.6  1995/05/30  07:57:57  rgrimes
+ * Remove trailing whitespace.
+ *
  * Revision 1.5  1995/05/11  19:25:55  rgrimes
  * Fix -Wformat warnings from LINT kernel.
  *
diff --git a/sys/gnu/i386/isa/nic3008.h b/sys/gnu/i386/isa/nic3008.h
index da82696bde35..f9a9939f5c55 100644
--- a/sys/gnu/i386/isa/nic3008.h
+++ b/sys/gnu/i386/isa/nic3008.h
@@ -1,6 +1,6 @@
-static char     nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     nic38hid[] = "@(#)nic3008.h,v 1.1 1995/02/14 15:00:12 jkh Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
+ *  II - Version 0.1 1.1   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,16 @@ static char     nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr E
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: nic3008.h,v $
+ * nic3008.h,v
+ * Revision 1.1  1995/02/14  15:00:12  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 1816ee562fb9..804e9e152a02 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.5 1995/03/28 07:54:33 bde Exp $";
+static char     nic39_id[] = "@(#)nic3009.c,v 1.6 1995/05/11 19:25:56 rgrimes Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
+ *  II - Version 0.1 1.6   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,10 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.5 1995/03/28 07:54:33 bde E
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: nic3009.c,v $
+ * nic3009.c,v
+ * Revision 1.6  1995/05/11  19:25:56  rgrimes
+ * Fix -Wformat warnings from LINT kernel.
+ *
  * Revision 1.5  1995/03/28  07:54:33  bde
  * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
  * (except in netccitt, netiso and netns) that I didn't notice when I fixed
diff --git a/sys/gnu/i386/isa/nic3009.h b/sys/gnu/i386/isa/nic3009.h
index 223619f6a5ca..b1a0a5bb0f27 100644
--- a/sys/gnu/i386/isa/nic3009.h
+++ b/sys/gnu/i386/isa/nic3009.h
@@ -1,6 +1,6 @@
-static char     nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     nic39hid[] = "@(#)nic3009.h,v 1.1 1995/02/14 15:00:16 jkh Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
+ *  II - Version 0.1 1.1   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,16 @@ static char     nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr E
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: nic3009.h,v $
+ * nic3009.h,v
+ * Revision 1.1  1995/02/14  15:00:16  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
diff --git a/sys/gnu/i386/isa/niccyreg.h b/sys/gnu/i386/isa/niccyreg.h
index a9d832849ea0..fa4d514be5bb 100644
--- a/sys/gnu/i386/isa/niccyreg.h
+++ b/sys/gnu/i386/isa/niccyreg.h
@@ -1,6 +1,6 @@
-static char     nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     nicregh_id[] = "@(#)niccyreg.h,v 1.1 1995/02/14 15:00:19 jkh Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
+ *  II - Version 0.1 1.1   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,16 @@ static char     nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jk
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: niccyreg.h,v $
+ * niccyreg.h,v
+ * Revision 1.1  1995/02/14  15:00:19  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c
index 280023d017a6..8f59aad7cf1c 100644
--- a/sys/gnu/isdn/if_ii.c
+++ b/sys/gnu/isdn/if_ii.c
@@ -1,6 +1,6 @@
-static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.2 1995/02/15 06:28:26 jkh Exp $";
+static char     _if_iiid[] = "@(#)if_ii.c,v 1.3 1995/05/30 07:58:00 rgrimes Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.2 $   $State: Exp $
+ *  II - Version 0.1 1.3   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,10 @@ static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.2 1995/02/15 06:28:26 jkh Exp
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: if_ii.c,v $
+ * if_ii.c,v
+ * Revision 1.3  1995/05/30  07:58:00  rgrimes
+ * Remove trailing whitespace.
+ *
  * Revision 1.2  1995/02/15  06:28:26  jkh
  * Fix up include paths, nuke some warnings.
  *
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 7d170767d0d8..1d484accbd1a 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.2 1995/02/15 06:28:27 jkh Exp $";
+static char     _ispyid[] = "@(#)iispy.c,v 1.3 1995/03/28 07:54:40 bde Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.2 $   $State: Exp $
+ *  II - Version 0.1 1.3   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,12 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.2 1995/02/15 06:28:27 jkh Exp
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: iispy.c,v $
+ * iispy.c,v
+ * Revision 1.3  1995/03/28  07:54:40  bde
+ * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
+ * (except in netccitt, netiso and netns) that I didn't notice when I fixed
+ * "all" such warnings before.
+ *
  * Revision 1.2  1995/02/15  06:28:27  jkh
  * Fix up include paths, nuke some warnings.
  *
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index f7519639bc4c..1f2e6e38c7c1 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,6 +1,6 @@
-static char     _itelid[] = "@(#)$Id: iitel.c,v 1.2 1995/02/15 06:28:27 jkh Exp $";
+static char     _itelid[] = "@(#)iitel.c,v 1.3 1995/03/28 07:54:41 bde Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.2 $   $State: Exp $
+ *  II - Version 0.1 1.3   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,12 @@ static char     _itelid[] = "@(#)$Id: iitel.c,v 1.2 1995/02/15 06:28:27 jkh Exp
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: iitel.c,v $
+ * iitel.c,v
+ * Revision 1.3  1995/03/28  07:54:41  bde
+ * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
+ * (except in netccitt, netiso and netns) that I didn't notice when I fixed
+ * "all" such warnings before.
+ *
  * Revision 1.2  1995/02/15  06:28:27  jkh
  * Fix up include paths, nuke some warnings.
  *
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index 03d5f72959a3..d091c462b05c 100644
--- a/sys/gnu/isdn/iitty.c
+++ b/sys/gnu/isdn/iitty.c
@@ -1,6 +1,6 @@
-static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.4 1995/02/28 00:20:30 pst Exp $";
+static char     _ittyid[] = "@(#)iitty.c,v 1.5 1995/03/28 07:54:43 bde Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.4 $   $State: Exp $
+ *  II - Version 0.1 1.5   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,12 @@ static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.4 1995/02/28 00:20:30 pst Exp
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: iitty.c,v $
+ * iitty.c,v
+ * Revision 1.5  1995/03/28  07:54:43  bde
+ * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
+ * (except in netccitt, netiso and netns) that I didn't notice when I fixed
+ * "all" such warnings before.
+ *
  * Revision 1.4  1995/02/28  00:20:30  pst
  * Incorporate bde's code-review comments.
  *
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index e1e4fd1ee302..0b2255d3ed2c 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.3 1995/03/28 07:54:44 bde Exp $";
+static char     _isdnid[] = "@(#)isdn.c,v 1.4 1995/05/30 07:58:02 rgrimes Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.3 $   $State: Exp $
+ *  II - Version 0.1 1.4   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,10 @@ static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.3 1995/03/28 07:54:44 bde Exp $
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: isdn.c,v $
+ * isdn.c,v
+ * Revision 1.4  1995/05/30  07:58:02  rgrimes
+ * Remove trailing whitespace.
+ *
  * Revision 1.3  1995/03/28  07:54:44  bde
  * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
  * (except in netccitt, netiso and netns) that I didn't notice when I fixed
diff --git a/sys/gnu/isdn/isdn_ioctl.h b/sys/gnu/isdn/isdn_ioctl.h
index e0475d1812c7..3ed78f5eef4e 100644
--- a/sys/gnu/isdn/isdn_ioctl.h
+++ b/sys/gnu/isdn/isdn_ioctl.h
@@ -1,6 +1,6 @@
-static char     _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/02/14 15:00:35 jkh Exp $";
+static char     _isdn_ioctl_id[] = "@(#)isdn_ioctl.h,v 1.2 1995/03/28 07:54:45 bde Exp";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
+ *  II - Version 0.1 1.2   Exp
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -9,7 +9,12 @@ static char     _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/02/14 15:00
  *	jkr@saarlink.de or jkrause@guug.de
  *
  *******************************************************************************
- * $Log: isdn_ioctl.h,v $
+ * isdn_ioctl.h,v
+ * Revision 1.2  1995/03/28  07:54:45  bde
+ * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
+ * (except in netccitt, netiso and netns) that I didn't notice when I fixed
+ * "all" such warnings before.
+ *
  * Revision 1.1  1995/02/14  15:00:35  jkh
  * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
  * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index 4ad5a34556fb..25589c572a68 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-#	$Id$
+#	Makefile,v 1.2 1993/10/16 19:15:20 rgrimes Exp
 
 # Makefile for i386 tags file
 
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 1ba1472c4148..b49d43566e69 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -13,7 +13,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.11 1995/02/17 02:22:21 phk Exp $
+ *	apm.c,v 1.12 1995/05/30 07:58:06 rgrimes Exp
  */
 
 #include "apm.h"
diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile
index 3cc1f9d5e00a..2f06b39c6186 100644
--- a/sys/i386/apm/apm_init/Makefile
+++ b/sys/i386/apm/apm_init/Makefile
@@ -12,7 +12,7 @@
 #
 # Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
 #
-#	$Id: Makefile,v 1.3 1995/02/17 02:22:30 phk Exp $
+#	Makefile,v 1.4 1995/05/30 07:58:11 rgrimes Exp
 #
 
 OBJS = apm_init.o real_prot.o table.o
diff --git a/sys/i386/apm/apm_init/apm_init.S b/sys/i386/apm/apm_init/apm_init.S
index 76becc44d202..9ecd25e985d2 100644
--- a/sys/i386/apm/apm_init/apm_init.S
+++ b/sys/i386/apm/apm_init/apm_init.S
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_init.S,v 1.3 1994/10/01 21:29:49 phk Exp $
+ *	apm_init.S,v 1.4 1995/02/17 02:22:31 phk Exp
  */
 
 /*
diff --git a/sys/i386/apm/apm_init/bin2asm.c b/sys/i386/apm/apm_init/bin2asm.c
index 09c98f450ff1..2102ffd5540f 100644
--- a/sys/i386/apm/apm_init/bin2asm.c
+++ b/sys/i386/apm/apm_init/bin2asm.c
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: bin2asm.c,v 1.3 1995/02/17 02:22:33 phk Exp $
+ *	bin2asm.c,v 1.4 1995/05/30 07:58:13 rgrimes Exp
  */
 
 #include <stdio.h>
diff --git a/sys/i386/apm/apm_init/real_prot.S b/sys/i386/apm/apm_init/real_prot.S
index d61a394bb763..b56faf9ac5b2 100644
--- a/sys/i386/apm/apm_init/real_prot.S
+++ b/sys/i386/apm/apm_init/real_prot.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.2 1993/10/16 19:11:27 rgrimes Exp $
+ *	real_prot.S,v 1.1 1994/10/01 02:55:51 davidg Exp
  */
 
 
diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h
index 93b3f28fd427..56c9e67d7506 100644
--- a/sys/i386/apm/apm_init/real_prot.h
+++ b/sys/i386/apm/apm_init/real_prot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: real_prot.h,v 1.2 1995/02/17 02:22:33 phk Exp $
+ *	real_prot.h,v 1.3 1995/05/30 07:58:16 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/apm/apm_init/rmaouthdr b/sys/i386/apm/apm_init/rmaouthdr
index 47838b069352..615a829160ee 100644
--- a/sys/i386/apm/apm_init/rmaouthdr
+++ b/sys/i386/apm/apm_init/rmaouthdr
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
 #	from: Mach, Revision 2.2  92/04/04  11:36:01  rpd
-#	$Id: rmaouthdr,v 1.3 1993/10/16 19:11:37 rgrimes Exp $ 
+#	rmaouthdr,v 1.1 1994/10/01 02:55:53 davidg Exp 
 #
 dd if=$1 of=$2 ibs=32 skip=1 obs=1024b
diff --git a/sys/i386/apm/apm_init/table.c b/sys/i386/apm/apm_init/table.c
index b50d60fe803a..519fb005c8d2 100644
--- a/sys/i386/apm/apm_init/table.c
+++ b/sys/i386/apm/apm_init/table.c
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: table.c,v 1.3 1995/02/17 02:22:34 phk Exp $
+ *	table.c,v 1.4 1995/05/30 07:58:18 rgrimes Exp
  */
 
 #include <apm_bios.h>
diff --git a/sys/i386/apm/apm_setup.h b/sys/i386/apm/apm_setup.h
index f5e67efec461..f819e3e461e1 100644
--- a/sys/i386/apm/apm_setup.h
+++ b/sys/i386/apm/apm_setup.h
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_setup.h,v 1.3 1995/02/17 02:22:22 phk Exp $
+ *	apm_setup.h,v 1.4 1995/05/30 07:58:08 rgrimes Exp
  */
 
 extern u_long	apm_version;
diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s
index b3ae77d26a56..d6608b39fbbc 100644
--- a/sys/i386/apm/apm_setup.s
+++ b/sys/i386/apm/apm_setup.s
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_setup.s,v 1.4 1994/10/10 01:14:03 phk Exp $
+ *	apm_setup.s,v 1.5 1995/02/17 02:22:23 phk Exp
  */
 
 #include "apm.h"
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index c151bf2804a2..1b4a3db28453 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.24 1995/03/28 19:22:34 phk Exp $
+#	Makefile,v 1.25 1995/04/15 08:24:33 phk Exp
 
 SUBDIR=	biosboot netboot dosboot kzipboot
 
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index 7dfcf5420a70..3d2b438295d6 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.29 1995/04/20 18:36:13 phk Exp $
+#	Makefile,v 1.30 1995/04/20 23:15:03 joerg Exp
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index e8e7d028747f..df423d55a537 100644
--- a/sys/i386/boot/biosboot/README.386BSD
+++ b/sys/i386/boot/biosboot/README.386BSD
@@ -149,4 +149,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$Id: README.386BSD,v 1.2 1993/10/16 19:11:25 rgrimes Exp $
+README.386BSD,v 1.3 1995/02/16 12:02:08 jkh Exp
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index cb6232936e28..2ae336914043 100644
--- a/sys/i386/boot/biosboot/README.MACH
+++ b/sys/i386/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- *	$Id$
+ *	README.MACH,v 1.3 1993/10/16 19:11:26 rgrimes Exp
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/i386/boot/biosboot/README.serial b/sys/i386/boot/biosboot/README.serial
index d2a24afda35d..d6845ee74596 100644
--- a/sys/i386/boot/biosboot/README.serial
+++ b/sys/i386/boot/biosboot/README.serial
@@ -152,4 +152,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$Id: README.serial,v 1.2 1995/02/16 07:37:35 wpaul Exp $
+README.serial,v 1.3 1995/04/20 23:15:07 joerg Exp
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index ac59d5bb3bcb..0a0448c67ca1 100644
--- a/sys/i386/boot/biosboot/asm.S
+++ b/sys/i386/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.5 1994/10/06 09:41:01 rgrimes Exp $
+ *	asm.S,v 1.6 1995/01/25 21:37:36 bde Exp
  */
 
 
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index 5d2c380b9fd3..d6660a7b1fc8 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: asm.h,v 1.3 1993/10/16 19:11:29 rgrimes Exp $
+ *	asm.h,v 1.4 1995/05/30 07:58:25 rgrimes Exp
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S
index 54ccf6ea0ec6..88174a6949bd 100644
--- a/sys/i386/boot/biosboot/bios.S
+++ b/sys/i386/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.3 1994/10/02 05:18:25 rgrimes Exp $
+ *	bios.S,v 1.4 1994/11/18 05:02:12 phk Exp
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index ae4e45519a0c..7db0ff4c646d 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.43 1995/05/30 07:58:27 rgrimes Exp $
+ *	boot.c,v 1.43.2.1 1995/05/31 21:42:38 jkh Exp
  */
 
 
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index 11dd6d998999..56cfb07f43f8 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.9 1995/04/21 16:50:32 bde Exp $
+ *	boot.h,v 1.10 1995/05/30 07:58:29 rgrimes Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index 26a5442dc706..506e5fcaba14 100644
--- a/sys/i386/boot/biosboot/boot2.S
+++ b/sys/i386/boot/biosboot/boot2.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
- *	$Id: boot2.S,v 1.5 1994/08/30 01:38:03 bde Exp $
+ *	boot2.S,v 1.6 1995/01/25 21:37:40 bde Exp
  */
 
 #include	"asm.h"
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 7a605f475752..5e090e9f286a 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.12 1995/05/21 03:27:13 phk Exp $
+ *	disk.c,v 1.13 1995/05/30 07:58:31 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index 394c27111504..5a35ca1a19a2 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.13 1995/04/14 21:26:51 joerg Exp $
+ *	io.c,v 1.14 1995/05/30 07:58:33 rgrimes Exp
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c
index bd5113c5b7cc..8e8ee3283300 100644
--- a/sys/i386/boot/biosboot/probe_keyboard.c
+++ b/sys/i386/boot/biosboot/probe_keyboard.c
@@ -42,7 +42,7 @@
  *
  * This grody hack brought to you by Bill Paul (wpaul@ctr.columbia.edu)
  *
- *	$Id: probe_keyboard.c,v 1.4 1995/04/14 21:26:52 joerg Exp $
+ *	probe_keyboard.c,v 1.5 1995/04/20 23:15:10 joerg Exp
  */
 
 #ifndef FORCE_COMCONSOLE
diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S
index 281442418c57..6d5cdd2ed553 100644
--- a/sys/i386/boot/biosboot/serial.S
+++ b/sys/i386/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.2 1995/03/19 06:10:32 phk Exp $
+ *	serial.S,v 1.3 1995/04/21 16:30:18 bde Exp
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S
index d0bcbf89859a..61db53a4280b 100644
--- a/sys/i386/boot/biosboot/start.S
+++ b/sys/i386/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.4 1994/10/02 05:18:26 rgrimes Exp $
+ *	start.S,v 1.5 1994/10/06 09:41:05 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index c88fb3dc6a50..4799223ff16b 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.8 1995/04/14 21:26:53 joerg Exp $
+ *	sys.c,v 1.9 1995/05/30 07:58:34 rgrimes Exp
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index e9774f49a8dd..f23e04a80f78 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.6 1995/04/14 21:26:53 joerg Exp $
+ *	table.c,v 1.7 1995/05/30 07:58:36 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index 4646bbb0c229..5f0381180b06 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1995/03/28 19:22:43 phk Exp $
+#	Makefile,v 1.2 1995/05/30 07:58:41 rgrimes Exp
 #
 
 MPROG=	fbsdboot.exe
diff --git a/sys/i386/boot/dosboot/ansi.h b/sys/i386/boot/dosboot/ansi.h
index 4acad948f68e..f2a8e914e8b4 100644
--- a/sys/i386/boot/dosboot/ansi.h
+++ b/sys/i386/boot/dosboot/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)ansi.h	7.1 (Berkeley) 3/9/91

- *	$Id: ansi.h,v 1.2 1993/10/16 14:39:05 rgrimes Exp $

+ *	ansi.h,v 1.2 1995/04/27 18:22:12 phk Exp

  */

 

 #ifndef	_ANSI_H_

diff --git a/sys/i386/boot/dosboot/boot.c b/sys/i386/boot/dosboot/boot.c
index 8482279bea24..6e03343ec817 100644
--- a/sys/i386/boot/dosboot/boot.c
+++ b/sys/i386/boot/dosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, [92/04/03  16:51:14  rvb]

- *	$Id: boot.c,v 1.9.2.1 1994/05/01 05:14:49 rgrimes Exp $

+ *	boot.c,v 1.2 1995/04/27 18:22:13 phk Exp

  */

 

 

diff --git a/sys/i386/boot/dosboot/boot.h b/sys/i386/boot/dosboot/boot.h
index 322610f6ab0b..6f8ecf554371 100644
--- a/sys/i386/boot/dosboot/boot.h
+++ b/sys/i386/boot/dosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd

- *	$Id: boot.h,v 1.3 1993/10/16 19:11:32 rgrimes Exp $

+ *	boot.h,v 1.2 1995/04/27 18:22:14 phk Exp

  */

 

 #include "types.h"

diff --git a/sys/i386/boot/dosboot/bootinfo.h b/sys/i386/boot/dosboot/bootinfo.h
index 8315158db1cb..a75b67922f9d 100644
--- a/sys/i386/boot/dosboot/bootinfo.h
+++ b/sys/i386/boot/dosboot/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

  * SUCH DAMAGE.

  *

- *	$Id: bootinfo.h,v 1.3 1994/11/18 05:26:52 phk Exp $

+ *	bootinfo.h,v 1.2 1995/04/27 18:22:15 phk Exp

  */

 

 #ifndef	_MACHINE_BOOTINFO_H_

diff --git a/sys/i386/boot/dosboot/cdefs.h b/sys/i386/boot/dosboot/cdefs.h
index 09995d4a391d..c0a9803c4d92 100644
--- a/sys/i386/boot/dosboot/cdefs.h
+++ b/sys/i386/boot/dosboot/cdefs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *      from: @(#)cdefs.h       8.1 (Berkeley) 6/2/93

- *      $Id: cdefs.h,v 1.6 1993/10/16 17:16:24 rgrimes Exp $

+ *      cdefs.h,v 1.2 1995/04/27 18:22:15 phk Exp

  */

 

 #ifndef _CDEFS_H_

diff --git a/sys/i386/boot/dosboot/dinode.h b/sys/i386/boot/dosboot/dinode.h
index adfac172282e..d5f459bff9c0 100644
--- a/sys/i386/boot/dosboot/dinode.h
+++ b/sys/i386/boot/dosboot/dinode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)dinode.h	7.10 (Berkeley) 5/8/91

- *	$Id: dinode.h,v 1.5 1993/12/19 22:51:07 alm Exp $

+ *	dinode.h,v 1.2 1995/04/27 18:22:16 phk Exp

  */

 

 #ifndef _UFS_DINODE_H_

diff --git a/sys/i386/boot/dosboot/dir.h b/sys/i386/boot/dosboot/dir.h
index bc02fde23d7e..d84336e89f9e 100644
--- a/sys/i386/boot/dosboot/dir.h
+++ b/sys/i386/boot/dosboot/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)dir.h	7.3 (Berkeley) 2/5/91

- *	$Id: dir.h,v 1.2 1993/10/16 17:16:31 rgrimes Exp $

+ *	dir.h,v 1.2 1995/04/27 18:22:17 phk Exp

  */

 

 /*

diff --git a/sys/i386/boot/dosboot/disk.c b/sys/i386/boot/dosboot/disk.c
index 0a5fcec9b86f..4da2ee411ab4 100644
--- a/sys/i386/boot/dosboot/disk.c
+++ b/sys/i386/boot/dosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd

- *	$Id: disk.c,v 1.4 1994/02/22 22:59:40 rgrimes Exp $

+ *	disk.c,v 1.2 1995/04/27 18:22:17 phk Exp

  */

 #include <stdio.h>

 #include <memory.h>

diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h
index c155df578398..8b3fe67e7fcf 100644
--- a/sys/i386/boot/dosboot/disklabe.h
+++ b/sys/i386/boot/dosboot/disklabe.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93

- * $Id: disklabel.h,v 1.8 1994/11/14 13:08:44 bde Exp $

+ * disklabe.h,v 1.2 1995/04/27 18:22:18 phk Exp

  */

 

 #ifndef _SYS_DISKLABEL_H_

diff --git a/sys/i386/boot/dosboot/dkbad.h b/sys/i386/boot/dosboot/dkbad.h
index 33f1c5373ae6..07a15d4474fd 100644
--- a/sys/i386/boot/dosboot/dkbad.h
+++ b/sys/i386/boot/dosboot/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93

- * $Id: dkbad.h,v 1.5 1995/04/15 23:21:28 bde Exp $

+ * dkbad.h,v 1.2 1995/04/27 18:22:19 phk Exp

  */

 

 #ifndef _SYS_DKBAD_H_

diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h
index ff7dad5b10bf..e18d70a4b375 100644
--- a/sys/i386/boot/dosboot/endian.h
+++ b/sys/i386/boot/dosboot/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91

- *	$Id: endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp $

+ *	endian.h,v 1.2 1995/04/27 18:22:21 phk Exp

  */

 

 #ifndef _MACHINE_ENDIAN_H_

diff --git a/sys/i386/boot/dosboot/exec.h b/sys/i386/boot/dosboot/exec.h
index 6f6a9e97ee1c..a3399bc29732 100644
--- a/sys/i386/boot/dosboot/exec.h
+++ b/sys/i386/boot/dosboot/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)exec.h	8.3 (Berkeley) 1/21/94

- * $Id: exec.h,v 1.9 1994/10/09 21:50:57 sos Exp $

+ * exec.h,v 1.2 1995/04/27 18:22:22 phk Exp

  */

 

 #ifndef _SYS_EXEC_H_

diff --git a/sys/i386/boot/dosboot/fbsdboot.exe b/sys/i386/boot/dosboot/fbsdboot.exe
new file mode 100644
index 000000000000..4e14d9b99100
--- /dev/null
+++ b/sys/i386/boot/dosboot/fbsdboot.exe
diff --git a/sys/i386/boot/dosboot/fs.h b/sys/i386/boot/dosboot/fs.h
index 68ccd98040f2..7532bc2625b4 100644
--- a/sys/i386/boot/dosboot/fs.h
+++ b/sys/i386/boot/dosboot/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)fs.h	7.12 (Berkeley) 5/8/91

- *	$Id: fs.h,v 1.6 1993/12/19 22:51:09 alm Exp $

+ *	fs.h,v 1.2 1995/04/27 18:22:25 phk Exp

  */

 

 #ifndef _UFS_FS_H_

diff --git a/sys/i386/boot/dosboot/imgact.h b/sys/i386/boot/dosboot/imgact.h
index dde841e1ea83..9ad8540c2d91 100644
--- a/sys/i386/boot/dosboot/imgact.h
+++ b/sys/i386/boot/dosboot/imgact.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93

- *	$Id: imgact_aout.h,v 1.1 1994/09/24 21:09:18 davidg Exp $

+ *	imgact.h,v 1.2 1995/04/27 18:22:26 phk Exp

  */

 

 #ifndef	_IMGACT_AOUT_H_

diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h
index 9f9310b0416e..5b6923599544 100644
--- a/sys/i386/boot/dosboot/inode.h
+++ b/sys/i386/boot/dosboot/inode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)inode.h	7.17 (Berkeley) 5/8/91

- *	$Id: inode.h,v 1.6 1993/12/19 00:55:37 wollman Exp $

+ *	inode.h,v 1.2 1995/04/27 18:22:27 phk Exp

  */

 

 #ifndef _UFS_INODE_H_

diff --git a/sys/i386/boot/dosboot/mexec.h b/sys/i386/boot/dosboot/mexec.h
index dbaf8f2b28ab..225df83eee33 100644
--- a/sys/i386/boot/dosboot/mexec.h
+++ b/sys/i386/boot/dosboot/mexec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)exec.h	8.1 (Berkeley) 6/11/93

- * $Id: exec.h,v 1.5 1994/09/24 21:36:38 davidg Exp $

+ * mexec.h,v 1.2 1995/04/27 18:22:28 phk Exp

  */

 

 #ifndef	_EXEC_H_

diff --git a/sys/i386/boot/dosboot/param.h b/sys/i386/boot/dosboot/param.h
index 67882bfb70b3..c5541bdacaad 100644
--- a/sys/i386/boot/dosboot/param.h
+++ b/sys/i386/boot/dosboot/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91

- *	$Id: param.h,v 1.16 1994/09/18 22:05:22 bde Exp $

+ *	param.h,v 1.2 1995/04/27 18:22:28 phk Exp

  */

 

 #ifndef _MACHINE_PARAM_H_

diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h
index e1d72077748d..2a3423d1cbeb 100644
--- a/sys/i386/boot/dosboot/quota.h
+++ b/sys/i386/boot/dosboot/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)quota.h	7.9 (Berkeley) 2/22/91

- *	$Id: quota.h,v 1.3 1993/11/25 01:38:27 wollman Exp $

+ *	quota.h,v 1.2 1995/04/27 18:22:31 phk Exp

  */

 

 #ifndef _QUOTA_

diff --git a/sys/i386/boot/dosboot/reboot.h b/sys/i386/boot/dosboot/reboot.h
index 51b5f1f98f75..f2aa40200195 100644
--- a/sys/i386/boot/dosboot/reboot.h
+++ b/sys/i386/boot/dosboot/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93

- * $Id: reboot.h,v 1.7 1994/11/26 09:08:40 phk Exp $

+ * reboot.h,v 1.2 1995/04/27 18:22:32 phk Exp

  */

 

 #ifndef _SYS_REBOOT_H_

diff --git a/sys/i386/boot/dosboot/sys.c b/sys/i386/boot/dosboot/sys.c
index 172545cc7235..c77ce8e00336 100644
--- a/sys/i386/boot/dosboot/sys.c
+++ b/sys/i386/boot/dosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd

- *	$Id: sys.c,v 1.3 1993/10/16 19:11:39 rgrimes Exp $

+ *	sys.c,v 1.2 1995/04/27 18:22:33 phk Exp

  */

 #include <stdio.h>

 #include <string.h>

diff --git a/sys/i386/boot/dosboot/syslimit.h b/sys/i386/boot/dosboot/syslimit.h
index 007dbc615fcc..515787ceec5e 100644
--- a/sys/i386/boot/dosboot/syslimit.h
+++ b/sys/i386/boot/dosboot/syslimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)syslimits.h	7.4 (Berkeley) 2/4/91
- *	$Id: syslimits.h,v 1.4 1994/01/20 22:57:32 davidg Exp $
+ *	syslimit.h,v 1.2 1995/04/27 18:22:34 phk Exp
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h
index 6331d6932ff9..82a076ec2621 100644
--- a/sys/i386/boot/dosboot/sysparam.h
+++ b/sys/i386/boot/dosboot/sysparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)param.h	8.2 (Berkeley) 1/21/94

- * $Id: param.h,v 1.5 1994/09/01 05:12:51 davidg Exp $

+ * sysparam.h,v 1.2 1995/04/27 18:22:35 phk Exp

  */

 

 #ifndef _SYS_PARAM_H_

diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h
index 77d83731065e..def72b07f5dd 100644
--- a/sys/i386/boot/dosboot/types.h
+++ b/sys/i386/boot/dosboot/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)types.h	8.4 (Berkeley) 1/21/94

- * $Id: types.h,v 1.4 1994/09/25 15:56:25 davidg Exp $

+ * types.h,v 1.2 1995/04/27 18:22:36 phk Exp

  */

 

 #ifndef _SYS_TYPES_H_

diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile
index 0884fbdc2c3e..cdb404151d83 100644
--- a/sys/i386/boot/kzipboot/Makefile
+++ b/sys/i386/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/04/15 08:23:31 phk Exp $
+# Makefile,v 1.2 1995/05/29 01:38:03 phk Exp
 
 PROG= kzip.o
 SRCS= head.S boot.c unzip.c misc.c malloc.c inflate.c
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c
index 9ebfe5d3ae2c..078328e8b95a 100644
--- a/sys/i386/boot/netboot/3c509.c
+++ b/sys/i386/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$Id: 3c509.c,v 1.1 1995/04/12 20:14:56 martin Exp $
+3c509.c,v 1.2 1995/05/30 07:58:52 rgrimes Exp
 
 ***************************************************************************/
 
diff --git a/sys/i386/conf/BOOTMFS b/sys/i386/conf/BOOTMFS
new file mode 100644
index 000000000000..2eba24217df6
--- /dev/null
+++ b/sys/i386/conf/BOOTMFS
@@ -0,0 +1,117 @@
+#
+# BOOTMFS -- Generic machine with WD/AHx/NCR/BTx family disks
+#
+#	BOOTMFS,v 1.45.2.3 1995/06/05 21:50:41 jkh Exp
+#
+
+machine		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
+cpu		"I586_CPU"
+ident		BOOTMFS
+maxusers	10
+
+options		MATH_EMULATE		#Support for x87 emulation
+options		INET			#InterNETworking
+options		FFS			#Berkeley Fast Filesystem
+options		NFS			#Network Filesystem
+options		MSDOSFS			#MSDOS Filesystem
+options		"CD9660"		#ISO 9660 Filesystem
+options		PROCFS			#Process filesystem
+options		"COMPAT_43"		#Compatible with BSD 4.3
+options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
+options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
+options		UCONSOLE		#Allow users to grab the console
+
+config		kernel	root on wd0 
+
+controller	isa0
+controller	pci0
+
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+disk		fd0	at fdc0 drive 0
+disk		fd1	at fdc0 drive 1
+tape		ft0	at fdc0 drive 2
+
+controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
+disk		wd0	at wdc0 drive 0
+disk		wd1	at wdc0 drive 1
+
+controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
+disk		wd2	at wdc1 drive 0
+disk		wd3	at wdc1 drive 1
+
+controller	ncr0
+controller	ahc0
+
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+controller	ahc1	at isa? bio irq ? vector ahcintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
+controller	aic0    at isa? port 0x340 bio irq 11 vector aicintr
+controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
+controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
+controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
+
+controller	scbus0
+
+device		sd0
+
+device		st0
+
+device		cd0	#Only need one of these, the code dynamically grows
+
+device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
+device		mcd1	at isa? port 0x340 bio irq 11 vector mcdintr
+
+controller	matcd0	at isa? port ? bio
+
+device		scd0	at isa? port 0x230 bio
+
+# syscons is the default console driver, resembling an SCO console
+device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
+# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
+#device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
+#options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
+#options		XSERVER			# include code for XFree86
+
+device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
+
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
+device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
+device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
+
+device		lpt0	at isa? port? tty irq 7 vector lptintr
+device		lpt1	at isa? port? tty
+device		lpt2	at isa? port? tty
+
+# Order is important here due to intrusive probes, do *not* alphabetize
+# this list of network interfaces until the probes have been fixed.
+# Right now it appears that the ie0 must be probed before ep0. See
+# revision 1.20 of this file.
+device de0
+device ed0 at isa? port 0x280 net irq  5 iomem 0xd8000 vector edintr
+device ed1 at isa? port 0x300 net irq  5 iomem 0xd8000 vector edintr
+device ie0 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
+device ep0 at isa? port 0x300 net irq 10 vector epintr
+device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
+device lnc1 at isa? port 0x300 net irq 10 drq 0 vector lncintr
+device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
+device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
+
+pseudo-device	loop
+pseudo-device	ether
+pseudo-device	log
+pseudo-device	sl	1
+# ijppp uses tun instead of ppp device
+#pseudo-device	ppp	1
+pseudo-device	tun	1
+pseudo-device	pty	16
+pseudo-device	gzip		# Exec gzipped a.out's
+options  "MFS_ROOT=1075"
+options  MFS
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index e66e54716245..c6eeed209717 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.45.2.2 1995/06/05 17:15:42 davidg Exp $
+#	GENERIC,v 1.45.2.3 1995/06/05 21:50:41 jkh Exp
 #
 
 machine		"i386"
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index b233893396bf..0ad8b7496999 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.183 1995/05/27 04:32:12 davidg Exp $
+#	LINT,v 1.184 1995/05/28 13:24:16 rgrimes Exp
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index aef575547678..386937e350de 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.63 1995/05/11 19:48:45 wollman Exp $
+#	Makefile.i386,v 1.64 1995/05/30 07:59:05 rgrimes Exp
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index d64359e5e120..cc1000961487 100644
--- a/sys/i386/conf/devices.i386
+++ b/sys/i386/conf/devices.i386
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.i386,v 1.7 1994/12/04 22:36:50 phk Exp $
+#	devices.i386,v 1.8 1994/12/26 01:06:39 ats Exp
 #
 wd	0
 dk	1
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 30adf5826959..b1142886206d 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.97 1995/04/23 18:30:27 wollman Exp $
+#	files.i386,v 1.98 1995/04/28 00:51:20 dufault Exp
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/aic7xxx_asm.c"			   \
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index ca6baf3f0cd8..8fb7f035af5d 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -13,7 +13,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: eisaconf.c,v 1.1 1995/04/23 08:55:41 julian Exp $
+ * eisaconf.c,v 1.2 1995/05/30 07:59:07 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index 9b16c23543fa..75055c8fe2c9 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -13,7 +13,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: eisaconf.h,v 1.1 1995/04/23 08:55:42 julian Exp $
+ * eisaconf.h,v 1.2 1995/05/30 07:59:09 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/eisa/eisadevs.c b/sys/i386/eisa/eisadevs.c
index adbed9864418..84662aeb6be8 100644
--- a/sys/i386/eisa/eisadevs.c
+++ b/sys/i386/eisa/eisadevs.c
@@ -13,7 +13,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: eisadevs.c,v 1.1 1995/03/13 09:10:17 root Exp root $
+ * eisadevs.c,v 1.1 1995/04/23 08:55:43 julian Exp
  */
 
 /*
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index f0648c9f4441..460fef49e319 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.32 1995/05/29 04:08:13 davidg Exp $
+ *	autoconf.c,v 1.33 1995/05/30 07:59:14 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index 1b00786a442e..bb7e04dee138 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	5.8 (Berkeley) 5/12/91
- *	$Id: conf.c,v 1.84 1995/04/28 00:51:30 dufault Exp $
+ *	conf.c,v 1.85 1995/05/30 07:59:16 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 1500ff20382f..d3808af5411b 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.27 1995/04/24 16:42:59 bde Exp $
+ *	cons.c,v 1.28 1995/05/30 07:59:18 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h
index d99c3e5b06ea..a319978228aa 100644
--- a/sys/i386/i386/cons.h
+++ b/sys/i386/i386/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.8 1995/04/23 12:55:55 bde Exp $
+ *	cons.h,v 1.9 1995/04/24 16:43:01 bde Exp
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 8ce7365a7ac9..1fcf5eb03cb1 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_disasm.c,v 1.8 1995/01/29 02:38:15 bde Exp $
+ *	db_disasm.c,v 1.9 1995/05/30 07:59:20 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 8daa0a27aa32..675fbee50909 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.13 1995/04/08 21:31:53 joerg Exp $
+ *	db_interface.c,v 1.14 1995/05/30 07:59:22 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index dcbf19410f94..1d33fde5e11f 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.10 1995/03/16 18:11:26 bde Exp $
+ *	db_trace.c,v 1.11 1995/05/30 07:59:23 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/dkbad.c b/sys/i386/i386/dkbad.c
index cc70487ae304..45761b168279 100644
--- a/sys/i386/i386/dkbad.c
+++ b/sys/i386/i386/dkbad.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dkbad.c	5.4 (Berkeley) 1/19/91
- *	$Id: dkbad.c,v 1.3 1993/12/19 00:50:01 wollman Exp $
+ *	dkbad.c,v 1.4 1994/08/13 03:49:38 wollman Exp
  */
 
 
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index f10117ccc389..0e8afe3cb622 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.8 1995/02/14 19:16:40 sos Exp $
+ *	exception.s,v 1.8.2.1 1995/06/05 00:22:02 davidg Exp
  */
 
 #include "npx.h"				/* NNPX */
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index a5261849d80e..4fa25e0a8f23 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.26 1995/05/25 07:41:18 davidg Exp $
+ *	genassym.c,v 1.27 1995/05/30 07:59:25 rgrimes Exp
  */
 
 #include <stdio.h>
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index 1764a58da93b..9a559d695555 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -32,7 +32,7 @@
  *
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	$Id: in_cksum.c,v 1.6 1994/08/13 03:49:39 wollman Exp $
+ *	in_cksum.c,v 1.7 1995/05/30 07:59:31 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index f088f4c4d551..f239e9599ff9 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.51 1995/03/11 03:49:46 phk Exp $
+ *	locore.s,v 1.52 1995/04/16 10:12:16 davidg Exp
  */
 
 /*
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 4a2d41d73d76..c03aa55f183c 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.127 1995/05/25 07:41:20 davidg Exp $
+ *	machdep.c,v 1.128 1995/05/30 07:59:33 rgrimes Exp
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h
index 453a903554a6..977408dd9735 100644
--- a/sys/i386/i386/math_emu.h
+++ b/sys/i386/i386/math_emu.h
@@ -3,7 +3,7 @@
  *
  * (C) 1991 Linus Torvalds
  *
- *	$Id$
+ *	math_emu.h,v 1.2 1993/10/16 14:15:02 rgrimes Exp
  */
 #ifndef _LINUX_MATH_EMU_H
 #define _LINUX_MATH_EMU_H
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index d2ae7eb83ed5..9d83ad9b68be 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
  * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
  *
  *	from: 386BSD 0.1
- *	$Id: math_emulate.c,v 1.11 1995/05/11 19:26:09 rgrimes Exp $
+ *	math_emulate.c,v 1.12 1995/05/30 07:59:35 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 0d956888a089..2cee30b6320c 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.8 1994/05/25 08:54:24 rgrimes Exp $
+ *	mem.c,v 1.9 1994/08/06 10:25:34 davidg Exp
  */
 
 /*
diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index 19031c727c0b..01405791ea58 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Steve McCanne's microtime code
- *	$Id: microtime.s,v 1.6 1994/08/13 17:45:09 wollman Exp $
+ *	microtime.s,v 1.7 1994/11/05 23:53:46 bde Exp
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/i386/i386/ns_cksum.c b/sys/i386/i386/ns_cksum.c
index 142c9f827eec..c551a8100829 100644
--- a/sys/i386/i386/ns_cksum.c
+++ b/sys/i386/i386/ns_cksum.c
@@ -32,7 +32,7 @@
  *
  *	from: @(#)ns_cksum.c	7.7 (Berkeley) 4/29/91
  *	from NetBSD: ns_cksum.c,v 1.2 1993/05/22 07:59:55 cgd Exp
- *	$Id: ns_cksum.c,v 1.2 1993/12/19 00:50:07 wollman Exp $
+ *	ns_cksum.c,v 1.3 1994/08/13 03:49:43 wollman Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 99716033654a..7ddfb3355205 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.57 1995/05/11 19:26:11 rgrimes Exp $
+ *	pmap.c,v 1.58 1995/05/30 07:59:38 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 1b51d06a6eef..2f846840960b 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.3 1995/01/14 13:20:09 bde Exp $
+ *	procfs_machdep.c,v 1.4 1995/03/16 18:11:29 bde Exp
  */
 
 /*
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index db0fa03c5e4e..1e9551fd872e 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.21 1995/03/11 03:49:50 phk Exp $
+ *	support.s,v 1.22 1995/05/02 05:20:26 davidg Exp
  */
 
 #include "assym.s"				/* system definitions */
diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 5dd5edb80b4e..a98c130e7249 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swapgeneric.c	5.5 (Berkeley) 5/9/91
- *	$Id: swapgeneric.c,v 1.9 1995/04/03 00:25:06 wpaul Exp $
+ *	swapgeneric.c,v 1.10 1995/05/12 16:11:07 wpaul Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index e15298d6d046..3bae54291248 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.19 1995/01/21 15:20:23 bde Exp $
+ *	swtch.s,v 1.20 1995/02/17 02:22:42 phk Exp
  */
 
 #include "npx.h"	/* for NNPX */
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index ce017d599801..da3afb5d937e 100644
--- a/sys/i386/i386/symbols.raw
+++ b/sys/i386/i386/symbols.raw
@@ -1,6 +1,6 @@
 #	@(#)symbols.raw	7.6 (Berkeley) 5/8/91
 #
-#	$Id: symbols.raw,v 1.3 1994/05/25 08:55:13 rgrimes Exp $
+#	symbols.raw,v 1.4 1994/10/09 07:34:30 davidg Exp
 #
 
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 3c4f1cc264c3..722da8c29033 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.8 1995/03/10 08:13:07 davidg Exp $
+ *	sys_machdep.c,v 1.9 1995/05/30 07:59:40 rgrimes Exp
  *
  */
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index b3eea79695cd..cc78a7bdaf41 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.52 1995/05/30 07:59:43 rgrimes Exp $
+ *	trap.c,v 1.52.2.1 1995/06/05 00:22:04 davidg Exp
  */
 
 /*
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 0d1601675fb2..311716265833 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.27 1995/05/08 06:14:16 jkh Exp $
+ *      userconfig.c,v 1.28 1995/05/30 07:59:44 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 2ff3602015b3..4b5e086f9d29 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.38 1995/05/18 09:17:07 davidg Exp $
+ *	vm_machdep.c,v 1.39 1995/05/30 07:59:46 rgrimes Exp
  */
 
 #include "npx.h"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index 0a25b84ee584..85a4ed570ca5 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: coff.h,v 1.1 1994/10/12 19:37:16 sos Exp $
+ *	coff.h,v 1.1 1994/10/14 08:53:14 sos Exp
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2.h b/sys/i386/ibcs2/ibcs2.h
index 8063c7be0b84..8efc178d8e98 100644
--- a/sys/i386/ibcs2/ibcs2.h
+++ b/sys/i386/ibcs2/ibcs2.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2.h,v 1.3 1994/10/17 22:13:06 sos Exp $
+ *	ibcs2.h,v 1.4 1995/05/30 07:59:50 rgrimes Exp
  */
 
 /* trace all iBCS2 system calls */
diff --git a/sys/i386/ibcs2/ibcs2_dummy.c b/sys/i386/ibcs2/ibcs2_dummy.c
index 7a7c10275faf..3b4a47e3db1c 100644
--- a/sys/i386/ibcs2/ibcs2_dummy.c
+++ b/sys/i386/ibcs2/ibcs2_dummy.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_dummy.c,v 1.1 1994/10/14 08:52:59 sos Exp $
+ *	ibcs2_dummy.c,v 1.2 1995/05/30 07:59:51 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_file.c b/sys/i386/ibcs2/ibcs2_file.c
index c6217582a179..4b144c31b840 100644
--- a/sys/i386/ibcs2/ibcs2_file.c
+++ b/sys/i386/ibcs2/ibcs2_file.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ibcs2_file.c,v 1.2 1994/12/14 22:03:48 sos Exp $
+ *	ibcs2_file.c,v 1.3 1995/05/30 07:59:53 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 2f2a6cb8a67c..7b716e446458 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_ioctl.c,v 1.3 1994/10/23 19:19:42 sos Exp $
+ *	ibcs2_ioctl.c,v 1.4 1995/05/30 07:59:54 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index e2e5a5b81fcf..cd1ada91c7f5 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.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.
  *
- *	$Id: ibcs2_ipc.c,v 1.1 1994/10/14 08:53:04 sos Exp $
+ *	ibcs2_ipc.c,v 1.2 1995/05/30 07:59:56 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index a6c9dbd09593..6195c0245819 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_isc.c,v 1.3 1995/04/30 11:30:12 ache Exp $
+ *	ibcs2_isc.c,v 1.4 1995/05/30 07:59:58 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 742f211fd056..dbd0dac0c9ee 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ibcs2_misc.c,v 1.4 1995/05/02 17:14:38 ache Exp $
+ *	ibcs2_misc.c,v 1.5 1995/05/30 07:59:59 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 3171c2c2ea5a..647dc4cc405b 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ibcs2_signal.c,v 1.1 1994/10/14 08:53:07 sos Exp $
+ *	ibcs2_signal.c,v 1.2 1995/05/30 08:00:06 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index a1a52ad50851..6b2efbbf76db 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_socksys.c,v 1.2 1994/10/17 22:13:08 sos Exp $
+ *	ibcs2_socksys.c,v 1.3 1995/05/30 08:00:07 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h
index fc5b2e2fa963..c95d27137ee4 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.h
+++ b/sys/i386/ibcs2/ibcs2_socksys.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.
  *
- *	$Id: ibcs2_socksys.h,v 1.2 1994/10/17 22:13:10 sos Exp $
+ *	ibcs2_socksys.h,v 1.3 1995/05/30 08:00:09 rgrimes Exp
  */
 
 struct ss_call {
diff --git a/sys/i386/ibcs2/ibcs2_stats.c b/sys/i386/ibcs2/ibcs2_stats.c
index eee1ef4ca155..9bacee9e2b5a 100644
--- a/sys/i386/ibcs2/ibcs2_stats.c
+++ b/sys/i386/ibcs2/ibcs2_stats.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ibcs2_stats.c,v 1.1 1994/10/14 08:53:09 sos Exp $
+ *	ibcs2_stats.c,v 1.2 1995/05/30 08:00:11 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index 23ce9ce927cb..a1ba17437e31 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_sysent.c,v 1.1 1994/10/14 08:53:10 sos Exp $
+ *	ibcs2_sysent.c,v 1.2 1995/05/30 08:00:12 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 611ad1080a77..82f61a55b89a 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.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.
  *
- *	$Id: ibcs2_sysi86.c,v 1.1 1994/10/14 08:53:11 sos Exp $
+ *	ibcs2_sysi86.c,v 1.2 1995/05/30 08:00:14 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 3bbe7e7c9e71..a3f58521446c 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_xenix.c,v 1.4 1995/05/02 13:14:59 ache Exp $
+ *	ibcs2_xenix.c,v 1.5 1995/05/30 08:00:15 rgrimes Exp
  */
 
 #include <i386/ibcs2/ibcs2.h>
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index f7e7670be62f..1b5a533d50bf 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_coff.c,v 1.3 1995/04/08 15:52:30 joerg Exp $
+ *	imgact_coff.c,v 1.4 1995/05/30 08:00:17 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 601b0dfbfd53..6170834c7abf 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
- * $Id: ansi.h,v 1.6 1995/02/03 21:23:46 bde Exp $
+ * ansi.h,v 1.7 1995/05/30 08:00:22 rgrimes Exp
  */
 
 #ifndef _MACHINE_ANSI_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 868455b3bacb..1502f181570e 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -12,7 +12,7 @@
  *
  * Aug, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_bios.h,v 1.4 1995/02/17 02:22:45 phk Exp $
+ *	apm_bios.h,v 1.5 1995/05/30 08:00:23 rgrimes Exp
  */
 
 #ifndef _MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index c76df0787fad..4f49c9021119 100644
--- a/sys/i386/include/apm_segments.h
+++ b/sys/i386/include/apm_segments.h
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_segments.h,v 1.3 1995/02/17 02:22:46 phk Exp $
+ *	apm_segments.h,v 1.4 1995/05/30 08:00:25 rgrimes Exp
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index b2a6dc839f2e..bedf4e552c2e 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: asmacros.h,v 1.4 1994/08/19 11:20:11 jkh Exp $
+ *	asmacros.h,v 1.5 1994/09/08 12:25:18 bde Exp
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index d0b471f4ee5a..c19d00cba6bf 100644
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.h,v 1.4 1995/01/25 21:40:32 bde Exp $
+ *	bootinfo.h,v 1.5 1995/05/30 08:00:26 rgrimes Exp
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/cons.h b/sys/i386/include/cons.h
index faa17d12332c..2d3693282414 100644
--- a/sys/i386/include/cons.h
+++ b/sys/i386/include/cons.h
@@ -3,6 +3,6 @@
  * needs to access these functions.  In the mean time, just include the
  * header where it sits.
  *
- * $Id$
+ * cons.h,v 1.2 1994/08/02 07:38:41 davidg Exp
  */
 #include <i386/i386/cons.h>
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 870c5de887ec..eff61bd1bfe9 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.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.
  *
- *	$Id: console.h,v 1.18 1995/01/28 22:15:30 sos Exp $
+ *	console.h,v 1.19 1995/05/30 08:00:28 rgrimes Exp
  */
 
 #ifndef	_CONSOLE_H_
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 58a5ab6778ba..a64dfde9ec00 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- *	$Id: cpu.h,v 1.19 1994/12/03 10:18:24 bde Exp $
+ *	cpu.h,v 1.20 1995/05/04 07:50:06 davidg Exp
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 576ba23e26c8..ee39b7cac3a5 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.36 1995/05/14 22:25:11 davidg Exp $
+ *	cpufunc.h,v 1.37 1995/05/30 08:00:30 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 52d8e2051224..b23935b363a9 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.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.
  *
- *	$Id: cputypes.h,v 1.2 1993/11/07 17:42:49 wollman Exp $
+ *	cputypes.h,v 1.3 1994/09/04 19:59:23 pst Exp
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index cae2a45e191b..b43dd2a2e681 100644
--- a/sys/i386/include/db_machdep.h
+++ b/sys/i386/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: db_machdep.h,v 1.7 1995/01/14 10:34:52 bde Exp $
+ *	db_machdep.h,v 1.8 1995/05/30 08:00:34 rgrimes Exp
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/devconf.h b/sys/i386/include/devconf.h
index f4fbe34aa5d3..b93dcfdf8c01 100644
--- a/sys/i386/include/devconf.h
+++ b/sys/i386/include/devconf.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devconf.h,v 1.8 1995/02/04 12:47:19 se Exp $
+ *	devconf.h,v 1.9 1995/05/30 08:00:37 rgrimes Exp
  */
 /*
  * devconf.h - machine-dependent device configuration table
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index ac60e4c73d20..d65f2a1e3a66 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- *	$Id: endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp $
+ *	endian.h,v 1.6 1995/02/12 08:31:31 jkh Exp
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index c08283f7384a..8ceb444e99b5 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id: exec.h,v 1.4 1994/08/09 14:39:56 jkh Exp $
+ * exec.h,v 1.5 1994/09/24 21:36:38 davidg Exp
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index fb5967e6eadc..9c0bec18e7b5 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$Id: float.h,v 1.4 1993/10/16 14:39:16 rgrimes Exp $
+ *	float.h,v 1.5 1993/11/07 17:42:53 wollman Exp
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index 69cb204c835c..b0642c7edc29 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- *	$Id: floatingpoint.h,v 1.5 1994/08/04 19:16:36 wollman Exp $
+ *	floatingpoint.h,v 1.6 1994/09/20 22:26:37 bde Exp
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 9bee6edd2d13..ed7a998b2746 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.9 1994/05/25 08:56:02 rgrimes Exp $
+ *	frame.h,v 1.10 1995/03/16 18:11:42 bde Exp
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index d36ede3cbd1e..6faaa8fbbe52 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.1 1994/08/04 19:16:37 wollman Exp $
+ *	ieeefp.h,v 1.2 1994/08/05 14:36:04 wollman Exp
  */
 
 /*
diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h
index a330664c8579..3d1e474feb9e 100644
--- a/sys/i386/include/ioctl_ctx.h
+++ b/sys/i386/include/ioctl_ctx.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- *	$Id: ioctl_ctx.h,v 1.1 1994/10/01 17:59:38 davidg Exp $
+ *	ioctl_ctx.h,v 1.2 1995/05/30 08:00:40 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 67329399ad84..e058fc2af011 100644
--- a/sys/i386/include/ioctl_fd.h
+++ b/sys/i386/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id: ioctl_fd.h,v 1.6 1994/09/25 18:41:21 joerg Exp $
+ * ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
  */
 
 #ifndef _IOCTL_FD_H
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 773fa9c700c6..5da382fad7a6 100644
--- a/sys/i386/include/ipl.h
+++ b/sys/i386/include/ipl.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	ipl.h,v 1.2 1994/08/02 07:38:49 davidg Exp
  */
 
 #ifndef _ISA_IPL_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index c71216f7afff..3f7dd9b93fd5 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.8 1994/08/02 07:38:50 davidg Exp $
+ * limits.h,v 1.9 1995/02/03 21:49:18 bde Exp
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h
index a203c7d69d54..d47e26b95781 100644
--- a/sys/i386/include/lpt.h
+++ b/sys/i386/include/lpt.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id: lpt.h,v 1.2 1994/08/02 07:38:52 davidg Exp $
+ * lpt.h,v 1.3 1995/05/30 08:00:41 rgrimes Exp
  */
 
 #ifndef _LPT_PRINTER_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 34854b05c1b2..f8ac6261c29d 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.2 1995/03/28 07:55:08 bde Exp $
+ *	md_var.h,v 1.3 1995/05/30 08:00:43 rgrimes Exp
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index 95a66e474c6d..c94d67bb111d 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/include/mouse.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.
  *
- *	$Id: mouse.h,v 1.1 1994/05/17 14:05:31 jkh Exp $
+ *	mouse.h,v 1.1 1994/09/09 11:27:31 dfr Exp
  */
 
 struct mouseinfo {
diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h
index e8347e677541..98a04cb2e233 100644
--- a/sys/i386/include/mtpr.h
+++ b/sys/i386/include/mtpr.h
@@ -1,4 +1,4 @@
 /*
  *	Unused in 386BSD port
- *	$Id$
+ *	mtpr.h,v 1.2 1993/10/16 14:39:21 rgrimes Exp
  */
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index e56fdc216e2b..763fcb0c9b3f 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.6 1994/11/05 22:59:09 bde Exp $
+ *	npx.h,v 1.7 1995/01/03 03:57:46 bde Exp
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 716c19b64b74..da198d1790a3 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- *	$Id: param.h,v 1.18 1995/02/19 10:36:17 gpalmer Exp $
+ *	param.h,v 1.19 1995/05/25 07:41:27 davidg Exp
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index 9e64a3f13307..245f80f03ef4 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ *	display.h,v 1.2 1993/10/16 14:40:55 rgrimes Exp
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h
index ea221c7954a5..031eb5a64ff1 100644
--- a/sys/i386/include/pc/msdos.h
+++ b/sys/i386/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- *	$Id$
+ *	msdos.h,v 1.2 1993/10/16 14:40:57 rgrimes Exp
  */
 
 #define MSECTOR_SIZE	512		/* MSDOS sector size in bytes */
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index d88733470281..693fa7ff4e07 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.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.
  *
- *	$Id: pcaudioio.h,v 1.3 1994/09/29 08:31:39 sos Exp $
+ *	pcaudioio.h,v 1.4 1995/05/30 08:00:44 rgrimes Exp
  */
 
 #ifndef _PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 8ce7febb5ada..1141a5b7af19 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$Id: pcb.h,v 1.7 1994/10/08 22:21:33 phk Exp $
+ *	pcb.h,v 1.8 1994/12/03 10:02:55 bde Exp
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 6a35c0536f6a..8228302b9999 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.25 1995/03/26 23:42:55 davidg Exp $
+ * 	pmap.h,v 1.26 1995/05/30 08:00:48 rgrimes Exp
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index 92de3af87dcf..262c60075bb6 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$Id: proc.h,v 1.2 1993/10/16 14:39:24 rgrimes Exp $
+ *	proc.h,v 1.4 1994/05/25 08:56:29 rgrimes Exp
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index 9fe27ec5eda8..ebf1c4af07f1 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.3 1994/08/21 04:55:29 paul Exp $
+ * profile.h,v 1.4 1994/09/15 16:27:14 paul Exp
  */
 
 #ifndef _I386_MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 3d96dbc52495..566b1875bc68 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id: psl.h,v 1.5 1994/08/10 03:51:18 wollman Exp $
+ *	psl.h,v 1.6 1995/01/14 13:20:25 bde Exp
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/pte.h b/sys/i386/include/pte.h
index b68f71610cca..b406c794ac52 100644
--- a/sys/i386/include/pte.h
+++ b/sys/i386/include/pte.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pte.h	5.5 (Berkeley) 5/9/91
- *	$Id: pte.h,v 1.7 1994/09/04 23:10:25 davidg Exp $
+ *	pte.h,v 1.8 1995/05/30 08:00:49 rgrimes Exp
  */
 
 #ifndef _MACHINE_PTE_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index 0892b83e2606..d14d415db07c 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * ptrace.h,v 1.2 1994/08/02 07:38:57 davidg Exp
  */
 
 /*
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 9fc18148ff36..f9208a7119c6 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.9 1994/10/02 17:31:29 phk Exp $
+ *	reg.h,v 1.10 1995/01/14 10:41:41 bde Exp
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index 7f9cfad64a27..069e6805fd55 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $Id: reloc.h,v 1.3 1994/08/09 14:39:57 jkh Exp $
+ * reloc.h,v 1.4 1994/08/21 04:55:30 paul Exp
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index dcac309481a7..91a59b9023ef 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.8 1995/02/14 19:21:15 sos Exp $
+ *	segments.h,v 1.9 1995/05/30 08:00:50 rgrimes Exp
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 093278f1399a..420517d5258c 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $Id: signal.h,v 1.3 1994/08/02 07:39:01 davidg Exp $
+ * signal.h,v 1.4 1994/08/21 04:55:30 paul Exp
  */
 
 #ifndef _I386_MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h
index 7bd55ebe5501..28e7b7266e20 100644
--- a/sys/i386/include/soundcard.h
+++ b/sys/i386/include/soundcard.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.h,v 1.12 1995/03/08 18:43:49 ugen Exp $
+ * soundcard.h,v 1.13 1995/05/30 08:00:52 rgrimes Exp
  */
 
  /*
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index f097e4807cf8..70827290740f 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id$
+ * speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp
  */
 
 #ifndef _SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index 75cc79dae89b..0e7fea6fa0a2 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.6 1995/01/14 10:44:55 bde Exp $
+ *	specialreg.h,v 1.7 1995/05/30 08:00:54 rgrimes Exp
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/spl.h b/sys/i386/include/spl.h
index 1db479fe5ddc..1f1b7bc0ab20 100644
--- a/sys/i386/include/spl.h
+++ b/sys/i386/include/spl.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: spl.h,v 1.7 1995/05/11 00:13:01 wollman Exp $
+ *	spl.h,v 1.8 1995/05/11 07:44:16 bde Exp
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 0fce3ee8f433..b1e02ee497d9 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $Id: stdarg.h,v 1.5 1994/08/02 07:39:09 davidg Exp $
+ * stdarg.h,v 1.6 1995/01/24 16:22:52 ache Exp
  */
 
 #ifndef _STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 746cef1011fe..6d8ac6d8c9bd 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	sysarch.h,v 1.4 1994/08/02 07:39:11 davidg Exp
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index e1ead777f348..03e350964802 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$Id: trap.h,v 1.3 1993/11/07 17:43:15 wollman Exp $
+ *	trap.h,v 1.4 1995/01/14 13:20:26 bde Exp
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index fd07e357ffd8..2c17024379f8 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp $
+ *	tss.h,v 1.5 1995/05/30 08:00:57 rgrimes Exp
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index 78ce8d568ffc..6cd21c7ef243 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
- * $Id$
+ * types.h,v 1.4 1994/08/02 07:39:13 davidg Exp
  */
 
 #ifndef	_MACHTYPES_H_
diff --git a/sys/i386/include/ultrasound.h b/sys/i386/include/ultrasound.h
index 42d968850c14..4a3770ba0851 100644
--- a/sys/i386/include/ultrasound.h
+++ b/sys/i386/include/ultrasound.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * ultrasound.h,v 1.3 1994/08/02 07:39:15 davidg Exp
  */
 
 /*
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index fa6c9a7a9541..3bece1014350 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $Id$
+ * varargs.h,v 1.2 1994/08/02 07:39:17 davidg Exp
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 8ff3b451fcc2..f5976939afe6 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$Id: vmparam.h,v 1.17 1995/01/09 16:04:44 davidg Exp $
+ *	vmparam.h,v 1.18 1995/05/25 07:41:28 davidg Exp
  */
 
 
diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le
index 32dcc280c77c..3ad7b9193a71 100644
--- a/sys/i386/isa/README.le
+++ b/sys/i386/isa/README.le
@@ -1,4 +1,4 @@
-$Id: README.le,v 1.1 1994/10/01 20:15:43 wollman Exp $
+README.le,v 1.2 1994/11/13 21:19:18 nate Exp
 
 ----------------
 
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index d8a5bf03466f..99ec5204b396 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.44 1995/04/14 15:13:46 dufault Exp $
+ *      aha1542.c,v 1.45 1995/05/30 08:01:05 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c
index 727b9a481fc2..dfa37729cf32 100644
--- a/sys/i386/isa/aha1742.c
+++ b/sys/i386/isa/aha1742.c
@@ -14,7 +14,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *      $Id: aha1742.c,v 1.33 1995/05/11 19:26:15 rgrimes Exp $
+ *      aha1742.c,v 1.34 1995/05/30 08:01:07 rgrimes Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 2e8912c8412c..b27bfb515eb6 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.8 1995/04/12 20:47:35 wollman Exp $
+ * aic6360.c,v 1.9 1995/05/30 08:01:12 rgrimes Exp
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
diff --git a/sys/i386/isa/aic7770.c b/sys/i386/isa/aic7770.c
index ce4f94839292..4848e9941cb8 100644
--- a/sys/i386/isa/aic7770.c
+++ b/sys/i386/isa/aic7770.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7770.c,v 1.13 1995/04/12 20:47:36 wollman Exp $
+ *	aic7770.c,v 1.14 1995/05/30 08:01:15 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c
index cda418b72b74..803da086dc97 100644
--- a/sys/i386/isa/bt742a.c
+++ b/sys/i386/isa/bt742a.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: bt742a.c,v 1.35 1995/05/11 19:26:16 rgrimes Exp $
+ *      bt742a.c,v 1.36 1995/05/30 08:01:21 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 94aaddd6a65d..fde88128ed2a 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.34 1995/05/30 08:01:23 rgrimes Exp $
+ *	clock.c,v 1.34.2.1 1995/06/09 03:29:17 davidg Exp
  */
 
 /*
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 1124471b039d..107558528abf 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.5 1995/04/12 20:47:40 wollman Exp $
+ *	ctx.c,v 1.6 1995/05/30 08:01:27 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h
index 043bb1542656..17c1615130c0 100644
--- a/sys/i386/isa/ctxreg.h
+++ b/sys/i386/isa/ctxreg.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- *	$Id: ctxreg.h,v 1.1 1994/10/01 17:59:42 davidg Exp $
+ *	ctxreg.h,v 1.2 1995/05/30 08:01:28 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index fd898f24e23e..439a6cae5b45 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -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.
  *
- *	$Id: cy.c,v 1.6 1995/03/28 12:29:11 bde Exp $
+ *	cy.c,v 1.7 1995/05/30 08:01:34 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index 6b340193b366..62f51177c755 100644
--- a/sys/i386/isa/diskslice_machdep.c
+++ b/sys/i386/isa/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.13 1995/05/07 07:06:36 bde Exp $
+ *	diskslice_machdep.c,v 1.14 1995/05/18 22:45:35 phk Exp
  */
 
 #include <stddef.h>
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 07b2516b9328..711e0e371151 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: elink.c,v 1.4 1995/02/26 05:14:46 bde Exp $
+ *	elink.c,v 1.5 1995/05/30 08:01:36 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 93a5dac6f5ce..86322bc002af 100644
--- a/sys/i386/isa/elink.h
+++ b/sys/i386/isa/elink.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: elink.h,v 1.1 1994/05/25 20:06:43 ats Exp $
+ *	elink.h,v 1.1 1994/08/24 22:32:42 ats Exp
  */
 
 #define	ELINK_ID_PORT	0x100
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 66cbb4e8d63f..ec24993ffe02 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.61 1995/05/30 08:01:38 rgrimes Exp $
+ *	fd.c,v 1.61.2.1 1995/06/08 10:26:23 davidg Exp
  *
  */
 
diff --git a/sys/i386/isa/fdc.h b/sys/i386/isa/fdc.h
index 0216b7aa2e2e..3b6dd407dbba 100644
--- a/sys/i386/isa/fdc.h
+++ b/sys/i386/isa/fdc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fdc.h,v 1.4 1994/10/10 01:12:26 phk Exp $
+ *	fdc.h,v 1.5 1995/01/06 15:19:41 joerg Exp
  *
  */
 
diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h
index aef83574199a..16d3904622c7 100644
--- a/sys/i386/isa/fdreg.h
+++ b/sys/i386/isa/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.7 1994/09/25 18:42:23 joerg Exp $
+ *	fdreg.h,v 1.8 1994/09/25 23:37:38 phk Exp
  */
 
 /*
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index a56a84f432f7..4ca3bf8d1b68 100644
--- a/sys/i386/isa/ft.c
+++ b/sys/i386/isa/ft.c
@@ -17,7 +17,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *
  *  ft.c - QIC-40/80 floppy tape driver
- *  $Id: ft.c,v 1.21 1995/05/06 19:34:28 joerg Exp $
+ *  ft.c,v 1.22 1995/05/30 08:01:41 rgrimes Exp
  *
  *  01/19/95 ++sg
  *  Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x.
diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h
index 84ee90f08e62..f94c0e19b7fd 100644
--- a/sys/i386/isa/ic/i8042.h
+++ b/sys/i386/isa/ic/i8042.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ *	i8042.h,v 1.2 1993/10/16 13:48:47 rgrimes Exp
  */
 
 #define	KBSTATP		0x64	/* kbd controller status port (I) */
diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h
index 5493ca8eb44e..dcb4c4d1f84e 100644
--- a/sys/i386/isa/ic/i8237.h
+++ b/sys/i386/isa/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- *	$Id: i8237.h,v 1.3 1994/11/01 17:26:47 ache Exp $
+ *	i8237.h,v 1.4 1995/05/30 08:03:34 rgrimes Exp
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h
index 577313d81e5a..1b077d206934 100644
--- a/sys/i386/isa/ic/i82586.h
+++ b/sys/i386/isa/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	i82586.h,v 1.1 1993/10/12 06:53:10 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h
index 4eee86f6aa62..f6379afac637 100644
--- a/sys/i386/isa/ic/lemac.h
+++ b/sys/i386/isa/ic/lemac.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: lemac.h,v 1.1 1994/08/12 06:51:12 davidg Exp $
+ *      lemac.h,v 1.2 1995/05/30 08:03:36 rgrimes Exp
  */
 #ifndef _LEMAC_H_
 #define	_LEMAC_H_
diff --git a/sys/i386/isa/ic/nec765.h b/sys/i386/isa/ic/nec765.h
index 810e825bd66e..6e0d80b5ae34 100644
--- a/sys/i386/isa/ic/nec765.h
+++ b/sys/i386/isa/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id: nec765.h,v 1.3 1994/09/17 16:56:10 davidg Exp $
+ *	nec765.h,v 1.4 1995/01/06 15:20:00 joerg Exp
  */
 
 /*
diff --git a/sys/i386/isa/ic/ns16450.h b/sys/i386/isa/ic/ns16450.h
index aa6280df57d1..d5245ca35fb4 100644
--- a/sys/i386/isa/ic/ns16450.h
+++ b/sys/i386/isa/ic/ns16450.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16450.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ *	ns16450.h,v 1.2 1993/10/16 13:48:51 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h
index ff59757a5f73..372672e2e172 100644
--- a/sys/i386/isa/ic/ns16550.h
+++ b/sys/i386/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ *	ns16550.h,v 1.2 1993/10/16 13:48:52 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index a68269b0801a..bc24d15f80a9 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- *	$Id: icu.h,v 1.6 1994/09/18 23:18:32 bde Exp $
+ *	icu.h,v 1.7 1994/10/01 02:56:11 davidg Exp
  */
 
 /*
diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s
index 49d16b3eb366..602d6d700db0 100644
--- a/sys/i386/isa/icu.s
+++ b/sys/i386/isa/icu.s
@@ -36,7 +36,7 @@
  *
  *	@(#)icu.s	7.2 (Berkeley) 5/21/91
  *
- *	$Id: icu.s,v 1.21 1995/02/20 20:35:24 bde Exp $
+ *	icu.s,v 1.22 1995/04/01 04:56:32 ache Exp
  */
 
 /*
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 100d8f737582..b4af9815b70d 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -13,7 +13,7 @@
  *   the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
  *   and a variety of similar clones.
  *
- * $Id: if_ed.c,v 1.72 1995/05/14 11:01:20 davidg Exp $
+ * if_ed.c,v 1.73 1995/05/30 08:01:58 rgrimes Exp
  */
 
 #include "ed.h"
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index 430fa9393602..05b4fff8e4d9 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.17 1995/01/23 19:06:08 davidg Exp $
+ * if_edreg.h,v 1.18 1995/05/30 08:02:00 rgrimes Exp
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index ec02037d1230..e887cfb8944d 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.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.
  *
- * $Id: if_eg.c,v 1.3 1995/04/12 20:47:47 wollman Exp $
+ * if_eg.c,v 1.4 1995/05/30 08:02:02 rgrimes Exp
  */
 
 /* To do:
diff --git a/sys/i386/isa/if_egreg.h b/sys/i386/isa/if_egreg.h
index c4647a0bfcca..ce2fd8cee92b 100644
--- a/sys/i386/isa/if_egreg.h
+++ b/sys/i386/isa/if_egreg.h
@@ -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.
  *
- * $Id: if_egreg.h,v 1.1 1995/04/08 09:39:36 phk Exp $
+ * if_egreg.h,v 1.2 1995/05/30 08:02:03 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 8ca9d23c164b..9ad27dda8b19 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.13 1995/05/30 08:02:05 rgrimes Exp $
+ * if_el.c,v 1.13.2.1 1995/06/09 18:12:09 davidg Exp
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index 4d7859dd71c6..822239d3054c 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -4,7 +4,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $Id$
+ * if_elreg.h,v 1.2 1994/08/02 07:39:34 davidg Exp
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 3b677d6a9994..ed64a01ac9e2 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.27 1995/05/27 04:40:57 davidg Exp $
+ *  if_ep.c,v 1.28 1995/05/30 08:02:07 rgrimes Exp
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h
index e0b7d09834c6..990ccb8a42fa 100644
--- a/sys/i386/isa/if_epreg.h
+++ b/sys/i386/isa/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.7 1995/04/10 21:25:06 jkh Exp $
+ *  if_epreg.h,v 1.8 1995/05/30 08:02:09 rgrimes Exp
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 8f4b47a71e39..443d94f566a8 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.23 1995/04/12 20:47:50 wollman Exp $
+ *	if_ie.c,v 1.24 1995/05/30 08:02:13 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h
index 4bf87fcbb597..f861dc1760e5 100644
--- a/sys/i386/isa/if_ie507.h
+++ b/sys/i386/isa/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $Id: if_ie507.h,v 1.1 1994/05/25 20:06:49 ats Exp $
+ * if_ie507.h,v 1.1 1994/08/24 22:32:44 ats Exp
  * Definitions for 3C507
  */
 
diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h
index 3588b8414058..9a83a889645e 100644
--- a/sys/i386/isa/if_iereg.h
+++ b/sys/i386/isa/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * if_iereg.h,v 1.1 1993/10/12 06:52:34 rgrimes Exp
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index cf6158f6877e..bde640ac6cc5 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ix.c,v 1.6 1995/05/10 15:19:25 rgrimes Exp $
+ *	if_ix.c,v 1.7 1995/05/30 08:02:15 rgrimes Exp
  */
 
 #include "ix.h"
diff --git a/sys/i386/isa/if_ixreg.h b/sys/i386/isa/if_ixreg.h
index 3dd4903986c0..c836f74132f4 100644
--- a/sys/i386/isa/if_ixreg.h
+++ b/sys/i386/isa/if_ixreg.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.
  *
- *	$Id: if_ixreg.h,v 1.5 1995/05/10 15:19:29 rgrimes Exp $
+ *	if_ixreg.h,v 1.6 1995/05/30 08:02:17 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 0f93c75f75f2..40d9688232a4 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.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.
  *
- * $Id: if_le.c,v 1.16 1995/05/09 12:25:55 rgrimes Exp $
+ * if_le.c,v 1.17 1995/05/30 08:02:22 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index b1de9e69f5b3..860d91b1bf48 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.16 1995/05/24 20:33:42 davidg Exp $
+ * if_ze.c,v 1.17 1995/05/30 08:02:27 rgrimes Exp
  */
 
 #include "ze.h"
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 5ac6b08a2e54..5c6996658528 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.5 1995/04/20 07:22:04 phk Exp $
+ *	if_zp.c,v 1.6 1995/05/30 08:02:31 rgrimes Exp
  */
 /*-
  * TODO:
diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h
index a1eb1f54f4e6..29d5a85899af 100644
--- a/sys/i386/isa/if_zpreg.h
+++ b/sys/i386/isa/if_zpreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_zpreg.h,v 1.1 1995/02/17 02:22:53 phk Exp $
+ *	if_zpreg.h,v 1.2 1995/05/30 08:02:33 rgrimes Exp
  */
 /**************************************************************************
  *										  *
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 1dd0fb99557a..275143e61474 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.49 1995/05/13 00:09:38 jkh Exp $
+ *	isa.c,v 1.50 1995/05/30 08:02:35 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index 4357f42e6334..b8c0811f6d8a 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.13 1995/01/25 20:11:50 jmz Exp $
+ *	isa.h,v 1.14 1995/02/25 20:26:14 phk Exp
  */
 
 #ifndef _I386_ISA_ISA_H_
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 4e3c08c4a318..2a588cabd194 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.22 1995/05/11 02:15:55 jkh Exp $
+ *	isa_device.h,v 1.23 1995/05/11 07:41:52 jkh Exp
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
diff --git a/sys/i386/isa/iso8859.font b/sys/i386/isa/iso8859.font
index 0553a6bc2104..ffbe4f8d5a94 100644
--- a/sys/i386/isa/iso8859.font
+++ b/sys/i386/isa/iso8859.font
@@ -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.
  *
- *	$Id$
+ *	iso8859.font,v 1.6 1994/09/29 08:29:19 sos Exp
  */
 
 char font_8x8[256*8] = {
diff --git a/sys/i386/isa/kbd.h b/sys/i386/isa/kbd.h
index d34b6340675e..779c31f0f009 100644
--- a/sys/i386/isa/kbd.h
+++ b/sys/i386/isa/kbd.h
@@ -1,7 +1,7 @@
 /*
  * Keyboard definitions
  *	from: unknown origin, 386BSD 0.1
- *	$Id: kbd.h,v 1.3 1993/11/07 17:44:33 wollman Exp $
+ *	kbd.h,v 1.4 1995/05/30 08:02:38 rgrimes Exp
  */
 
 #ifndef _I386_ISA_KBD_H_
diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h
index a76105381ae7..bc50f2e3c226 100644
--- a/sys/i386/isa/kbdtables.h
+++ b/sys/i386/isa/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.
  *
- *	$Id: kbdtables.h,v 1.28 1995/03/27 19:41:11 sos Exp $
+ *	kbdtables.h,v 1.29 1995/03/28 21:30:13 sos Exp
  */
 
 #define SET8 0x80       	/* set eight bit on */
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index b5db1a5673de..c160010f2d6b 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.29 1995/05/09 01:33:16 phk Exp $
+ *	lpt.c,v 1.30 1995/05/30 08:02:42 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index 9e10ba91a510..c92971460760 100644
--- a/sys/i386/isa/lptreg.h
+++ b/sys/i386/isa/lptreg.h
@@ -6,7 +6,7 @@
  * William Jolitz.
  *
  *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- *	$Id$
+ *	lptreg.h,v 1.2 1993/10/16 13:46:12 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index d976194877fb..132c9085e3e8 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.43 1995/05/11 19:26:18 rgrimes Exp $
+ *	mcd.c,v 1.44 1995/05/30 08:02:44 rgrimes Exp
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h
index d5ece62169e7..f26d78d4326e 100644
--- a/sys/i386/isa/mcdreg.h
+++ b/sys/i386/isa/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.
  *
- *	$Id: mcdreg.h,v 1.7 1995/01/30 06:44:40 ache Exp $
+ *	mcdreg.h,v 1.8 1995/05/30 08:02:45 rgrimes Exp
  */
 
 #ifndef MCD_H
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 4dedadd5f4e9..380eefce3a80 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.11 1995/04/12 20:47:59 wollman Exp $
+ * mse.c,v 1.12 1995/05/30 08:02:47 rgrimes Exp
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 0a5327941724..8a96e694329f 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $
+ *	npx.c,v 1.23 1995/05/30 08:02:51 rgrimes Exp
  */
 
 #include "npx.h"
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index f53b92505406..086e7a900e72 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.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.
  *
- *	$Id: pcaudio.c,v 1.12 1995/03/30 14:33:03 sos Exp $
+ *	pcaudio.c,v 1.13 1995/05/30 08:02:55 rgrimes Exp
  */
 
 #include "pca.h"
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 7fbb80f12cd1..f7bd1ce6b7d4 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
+**  pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp
 **
 **  pci bus subroutines for i386 architecture.
 **
diff --git a/sys/i386/isa/readMBR.c b/sys/i386/isa/readMBR.c
index 751572346df4..c3d09865849b 100644
--- a/sys/i386/isa/readMBR.c
+++ b/sys/i386/isa/readMBR.c
@@ -15,7 +15,7 @@
  * written by julian elischer (julian@tfs.com)
  *
  *	@(#)readMBR.c	8.5 (tfs) 1/21/94
- * $Id: readMBR.c,v 1.4 1994/11/14 13:22:41 bde Exp $
+ * readMBR.c,v 1.5 1995/05/30 08:03:00 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h
index f580ff367836..3804794f6a75 100644
--- a/sys/i386/isa/rtc.h
+++ b/sys/i386/isa/rtc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- *	$Id: rtc.h,v 1.6 1994/09/20 00:31:07 ache Exp $
+ *	rtc.h,v 1.7 1994/12/04 20:22:20 joerg Exp
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 9f50105f57f6..dbfece8052dc 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.4 1995/05/09 12:25:58 rgrimes Exp $ */
+/* scd.c,v 1.5 1995/05/30 08:03:02 rgrimes Exp */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h
index 692999242916..a862ec54309f 100644
--- a/sys/i386/isa/scdreg.h
+++ b/sys/i386/isa/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.
  *
- * $Id: scdreg.h,v 1.3 1995/02/06 22:35:07 jkh Exp $
+ * scdreg.h,v 1.1 1995/03/24 18:33:02 jkh Exp
  *
  */
 
diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c
index de18f23cadc0..1d52ec9ecaac 100644
--- a/sys/i386/isa/seagate.c
+++ b/sys/i386/isa/seagate.c
@@ -46,7 +46,7 @@
  *               delays, device flags, polling mode, generic cleanup
  * vak    950115 Added request-sense ops
  *
- * $Id: seagate.c,v 1.7 1995/04/12 20:48:03 wollman Exp $
+ * seagate.c,v 1.8 1995/05/30 08:03:04 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 4ae58cddc9ef..0836fb9c4e61 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.98 1995/05/11 19:26:19 rgrimes Exp $
+ *	sio.c,v 1.99 1995/05/30 08:03:06 rgrimes Exp
  */
 
 #include "sio.h"
diff --git a/sys/i386/isa/sioreg.h b/sys/i386/isa/sioreg.h
index d43bcdf02ee9..a4600960e5e5 100644
--- a/sys/i386/isa/sioreg.h
+++ b/sys/i386/isa/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.2 1993/10/16 19:17:18 rgrimes Exp $
+ *	sioreg.h,v 1.3 1995/01/20 07:34:18 wpaul Exp
  */
 
 
diff --git a/sys/i386/isa/sound/dev_table.h b/sys/i386/isa/sound/dev_table.h
index f27822399ef5..bff7342420c3 100644
--- a/sys/i386/isa/sound/dev_table.h
+++ b/sys/i386/isa/sound/dev_table.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dev_table.h,v 1.13 1995/03/28 07:56:11 bde Exp $
+ * dev_table.h,v 1.14 1995/05/30 08:04:22 rgrimes Exp
  */
 
 #ifndef _DEV_TABLE_H_
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index e7d82168ddef..6c087e07a707 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dmabuf.c,v 1.15 1995/05/07 06:38:47 pst Exp $
+ * dmabuf.c,v 1.16 1995/05/30 08:04:24 rgrimes Exp
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c
index 1008aa444af8..0f884c1610c1 100644
--- a/sys/i386/isa/sound/gus_wave.c
+++ b/sys/i386/isa/sound/gus_wave.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: gus_wave.c,v 1.14 1995/03/12 23:33:52 swallace Exp $
+ * gus_wave.c,v 1.15 1995/03/17 21:27:39 swallace Exp
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c
index 18c64e584404..a64cb29e70be 100644
--- a/sys/i386/isa/sound/pas2_mixer.c
+++ b/sys/i386/isa/sound/pas2_mixer.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pas2_mixer.c,v 1.7 1994/10/01 02:16:56 swallace Exp $
+ * pas2_mixer.c,v 1.11 1995/03/12 23:33:59 swallace Exp
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c
index 5db3c9b30d66..f99da9bb8d74 100644
--- a/sys/i386/isa/sound/sb_dsp.c
+++ b/sys/i386/isa/sound/sb_dsp.c
@@ -29,7 +29,7 @@
  *	Hunyue Yau	Jan 6 1994
  *	Added code to support Sound Galaxy NX Pro
  *
- * $Id: sb_dsp.c,v 1.22 1994/12/10 22:55:50 ats Exp $
+ * sb_dsp.c,v 1.25 1995/03/12 23:34:02 swallace Exp
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index 4e48e658346d..ff62c01aff11 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sb_midi.c,v 1.4 1994/10/01 02:17:05 swallace Exp $
+ * sb_midi.c,v 1.7 1995/03/12 23:34:03 swallace Exp
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index 66194eda993a..815880bd716d 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sequencer.c,v 1.7 1994/10/01 02:17:09 swallace Exp $
+ * sequencer.c,v 1.10 1995/03/12 23:34:04 swallace Exp
  */
 
 #define SEQUENCER_C
diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc
index 6eb177c1c9aa..bb2c1483fc17 100644
--- a/sys/i386/isa/sound/sound.doc
+++ b/sys/i386/isa/sound/sound.doc
@@ -1,4 +1,4 @@
-$Id: sound.doc,v 1.2 1995/03/12 23:34:06 swallace Exp $
+sound.doc,v 1.3 1995/03/13 18:49:37 swallace Exp
 
 Instructions on using audio on a FreeBSD 2.1 (or 2.0-current) system.
 See also /sys/i386/conf/LINT.
diff --git a/sys/i386/isa/sound/sound_calls.h b/sys/i386/isa/sound/sound_calls.h
index ed0097504c3c..a2f6b96e7d9c 100644
--- a/sys/i386/isa/sound/sound_calls.h
+++ b/sys/i386/isa/sound/sound_calls.h
@@ -1,7 +1,7 @@
 /*
  *	DMA buffer calls
  *
- * $Id: sound_calls.h,v 1.12 1995/05/07 06:38:48 pst Exp $
+ * sound_calls.h,v 1.13 1995/05/30 08:04:41 rgrimes Exp
  */
 
 #ifndef _MACHINE_ISA_SOUND_H_
diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h
index c3732d58178f..23362965c37d 100644
--- a/sys/i386/isa/sound/sound_config.h
+++ b/sys/i386/isa/sound/sound_config.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sound_config.h,v 1.9 1995/03/12 23:34:07 swallace Exp $
+ * sound_config.h,v 1.10 1995/05/30 08:04:42 rgrimes Exp
  */
 
 #include "local.h"
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index a3967274ae46..56beeb3bb8d8 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.25 1995/05/11 19:26:24 rgrimes Exp $
+ * soundcard.c,v 1.26 1995/05/30 08:04:44 rgrimes Exp
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 4c1f12890640..091b6b75ef0e 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.13 1995/05/05 06:15:11 davidg Exp $
+ *    spkr.c,v 1.14 1995/05/30 08:03:09 rgrimes Exp
  */
 
 #include "speaker.h"
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 19c572a5c039..c2f4942f1d3d 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.116 1995/05/21 18:30:05 sos Exp $
+ *  syscons.c,v 1.117 1995/05/30 08:03:13 rgrimes Exp
  */
 
 #include "sc.h"
diff --git a/sys/i386/isa/syscons.h b/sys/i386/isa/syscons.h
index 4b22de6e83b9..5e502da4c97d 100644
--- a/sys/i386/isa/syscons.h
+++ b/sys/i386/isa/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.
  *
- *	$Id: syscons.h,v 1.8 1995/04/23 10:15:38 bde Exp $
+ *	syscons.h,v 1.9 1995/05/30 08:03:15 rgrimes Exp
  */
 
 #ifndef SYSCONS_H
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index 5742f6601493..b596bbb14dbb 100644
--- a/sys/i386/isa/timerreg.h
+++ b/sys/i386/isa/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id$
+ *	timerreg.h,v 1.2 1993/10/16 13:46:26 rgrimes Exp
  */
 
 /*
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index f7184c101ce1..4910031b8c68 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -22,7 +22,7 @@
  * today: Fri Jun  2 17:21:03 EST 1994
  * added 24F support  ++sg
  *
- *      $Id: ultra14f.c,v 1.32 1995/05/11 19:26:21 rgrimes Exp $
+ *      ultra14f.c,v 1.33 1995/05/30 08:03:18 rgrimes Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index bbed601c550d..86998e9e2ed5 100644
--- a/sys/i386/isa/vector.s
+++ b/sys/i386/isa/vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.11 1994/12/03 10:03:19 bde Exp $
+ *	vector.s,v 1.12 1995/04/15 21:32:18 bde Exp
  */
 
 #include <i386/isa/icu.h>
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 412ba4dec7a5..2dba4d3fa46d 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.80 1995/05/09 12:26:00 rgrimes Exp $
+ *	wd.c,v 1.81 1995/05/16 07:52:04 davidg Exp
  */
 
 /* TODO:
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index 1674923447c9..f383628aef97 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: wdreg.h,v 1.7 1995/02/26 01:15:29 bde Exp $
+ *	wdreg.h,v 1.8 1995/03/22 05:23:01 davidg Exp
  */
 
 /*
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 87f3ae71b409..8c4dbeb7de0c 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.16 1995/04/12 20:48:13 wollman Exp $
+ * wt.c,v 1.17 1995/05/30 08:03:22 rgrimes Exp
  *
  */
 
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index cbc19ca6a69b..df129547854a 100644
--- a/sys/i386/isa/wtreg.h
+++ b/sys/i386/isa/wtreg.h
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wtreg.h,v 1.4 1993/12/13 18:38:44 alm Exp $
+ * wtreg.h,v 1.5 1995/05/30 08:03:24 rgrimes Exp
  *
  */
 
diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c
index 1f76008b9e5f..497ac52a0d0c 100644
--- a/sys/i386/scsi/aic7xxx.c
+++ b/sys/i386/scsi/aic7xxx.c
@@ -24,7 +24,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *      $Id: aic7xxx.c,v 1.28.2.2 1995/06/04 17:54:23 davidg Exp $
+ *      aic7xxx.c,v 1.28.2.3 1995/06/09 18:06:45 davidg Exp
  */
 /*
  * TODO:
diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h
index 3bfe18614217..a4b7ed7ede74 100644
--- a/sys/i386/scsi/aic7xxx.h
+++ b/sys/i386/scsi/aic7xxx.h
@@ -20,7 +20,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7xxx.h,v 1.9 1995/05/30 08:04:54 rgrimes Exp $
+ *	aic7xxx.h,v 1.9.2.1 1995/06/04 09:15:29 davidg Exp
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index de414974103b..f90fb1022e49 100644
--- a/sys/isofs/cd9660/TODO
+++ b/sys/isofs/cd9660/TODO
@@ -1,4 +1,4 @@
-#	$Id: TODO,v 1.1.1.1 1994/05/24 10:04:12 rgrimes Exp $
+#	TODO,v 1.2 1995/01/16 17:03:23 joerg Exp
 
  1) should understand "older", original High Sierra ("CDROM001") type
 
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index 32439ce96abf..edcb8abd3bcd 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $Id$
+ * cd9660_bmap.c,v 1.2 1994/08/02 07:41:15 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index e035ce03a23b..0850ed60836e 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.6 1995/01/16 17:03:23 joerg Exp $
+ * cd9660_lookup.c,v 1.7 1995/05/30 08:04:57 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 7b321a788274..ad474476aaf7 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.10 1995/03/16 18:12:15 bde Exp $
+ * cd9660_node.c,v 1.11 1995/05/30 08:04:59 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 1e593a28c20b..a680cd37c97c 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.h,v 1.4 1995/01/16 17:03:25 joerg Exp $
+ * cd9660_node.h,v 1.5 1995/03/16 18:12:16 bde Exp
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index dca898301697..a3d1b70f8b0d 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_rrip.c,v 1.6 1995/01/16 17:03:26 joerg Exp $
+ * cd9660_rrip.c,v 1.7 1995/05/30 08:05:00 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h
index bc9429cbc5ee..a3fe5649843c 100644
--- a/sys/isofs/cd9660/cd9660_rrip.h
+++ b/sys/isofs/cd9660/cd9660_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.1 (Berkeley) 1/21/94
- * $Id: cd9660_rrip.h,v 1.2 1994/08/02 07:41:30 davidg Exp $
+ * cd9660_rrip.h,v 1.3 1995/01/16 17:03:26 joerg Exp
  */
 
 typedef struct {
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 3d58e4e16d57..0ddeb7df3946 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.1 (Berkeley) 1/21/94
- * $Id: cd9660_util.c,v 1.3 1994/08/02 07:41:31 davidg Exp $
+ * cd9660_util.c,v 1.4 1995/05/30 08:05:02 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index afa08f473811..63336c131be9 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
- * $Id: cd9660_vfsops.c,v 1.12 1995/05/19 03:25:35 davidg Exp $
+ * cd9660_vfsops.c,v 1.13 1995/05/30 08:05:03 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 3b538a8d0cb5..c6784b0cf09c 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.13 1995/03/28 07:46:38 phk Exp $
+ * cd9660_vnops.c,v 1.14 1995/05/30 08:05:05 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 406572e42e0c..1c28cb4e800f 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
- * $Id: iso.h,v 1.4 1995/01/16 17:03:29 joerg Exp $
+ * iso.h,v 1.5 1995/05/30 08:05:06 rgrimes Exp
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 031aaa37358b..b6799e076eb0 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $Id$
+ * iso_rrip.h,v 1.2 1994/08/02 07:41:40 davidg Exp
  */
 
 
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index a09e4848a08d..00dfd2cbc2a4 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,5 +1,5 @@
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
-# $Id$
+# Make.tags.inc,v 1.2 1994/08/02 07:41:47 davidg Exp
 
 # Common files for "make tags".
 # Included by the Makefile for each architecture.
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 7e42de22f5db..5dd007d56a34 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.13 1995/05/30 08:05:17 rgrimes Exp $
+ *	imgact_aout.c,v 1.13.2.1 1995/06/04 16:58:44 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 1fb4c9213b04..f380bcc70723 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: imgact_gzip.c,v 1.13 1995/03/16 18:12:27 bde Exp $
+ * imgact_gzip.c,v 1.14 1995/05/30 08:05:18 rgrimes Exp
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 8340221b0355..ddcaaa5136fe 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_shell.c,v 1.5 1994/08/18 22:34:56 wollman Exp $
+ *	imgact_shell.c,v 1.6 1994/09/25 19:33:32 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 862418bbcd5d..4cc250ed6dda 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.c,v 1.4 1994/10/22 11:40:28 phk Exp $
+ * inflate.c,v 1.5 1995/04/15 06:54:13 phk Exp
  *
  *
  */
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 89874b23d0ec..e4fc462390ca 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.24 1995/05/14 02:59:55 davidg Exp $
+ * init_main.c,v 1.25 1995/05/19 03:26:43 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 8f34c0d9d709..3696c51c1186 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: syscalls.master,v 1.14 1995/03/25 16:52:11 davidg Exp $
+ * created from	init_sysent.c,v 1.22 1995/04/23 12:20:46 ache Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 46ed69730c4b..ba64d1e64e70 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.5 1994/09/26 21:09:00 davidg Exp $
+ *	kern_acct.c,v 1.6 1994/10/02 17:35:09 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 7a6d79b5fc05..db883df8de31 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $
+ * kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp
  */
 
 /* Portions of this software are covered by the following: */
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 07cec1b7d13c..03d22d24a757 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.9 1995/03/28 07:56:26 bde Exp $
+ * kern_descrip.c,v 1.10 1995/05/30 08:05:21 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_devconf.c b/sys/kern/kern_devconf.c
index bcdf87e23ad4..c7c81bd8eed9 100644
--- a/sys/kern/kern_devconf.c
+++ b/sys/kern/kern_devconf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_devconf.c,v 1.9 1995/04/13 15:33:14 wollman Exp $
+ *	kern_devconf.c,v 1.10 1995/05/30 08:05:23 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 59a411bc8ddd..547c8c82226f 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.20 1995/03/25 01:34:21 davidg Exp $
+ *	kern_exec.c,v 1.21 1995/05/30 08:05:24 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 156dc47cf792..ca65c3eb0850 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.14 1995/03/16 18:12:31 bde Exp $
+ * kern_exit.c,v 1.15 1995/05/30 08:05:25 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index d1f671a2a9cc..588e6bce442b 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
- * $Id: kern_fork.c,v 1.11 1995/03/16 18:12:32 bde Exp $
+ * kern_fork.c,v 1.12 1995/05/30 08:05:27 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index d89e2ca45052..5ced82cb39ea 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id: kern_ktrace.c,v 1.5 1994/10/02 17:35:15 phk Exp $
+ * kern_ktrace.c,v 1.6 1995/05/30 08:05:28 rgrimes Exp
  */
 
 #ifdef KTRACE
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index ccc7c4ef2550..83d6ef7c1fd9 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.12 1995/04/20 05:08:31 wpaul Exp $
+ * kern_lkm.c,v 1.13 1995/05/30 08:05:30 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 261c47f9efea..611bcfd72aef 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
- * $Id: kern_lockf.c,v 1.3 1994/10/25 11:27:51 davidg Exp $
+ * kern_lockf.c,v 1.4 1995/05/30 08:05:31 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 600e54f6b1ce..ee14c8c3e8e7 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.11 1995/04/16 11:25:15 davidg Exp $
+ * kern_malloc.c,v 1.12 1995/05/30 08:05:33 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index b706dee37b85..16b090ebbc21 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.10 1995/03/16 18:12:34 bde Exp $
+ * kern_physio.c,v 1.11 1995/05/30 08:05:36 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 3fa8cf2da8d2..e971af735999 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.4 (Berkeley) 1/4/94
- * $Id: kern_proc.c,v 1.9 1994/10/10 01:00:45 phk Exp $
+ * kern_proc.c,v 1.10 1995/05/30 08:05:37 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 200d73195fbf..694a6d84971e 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_prot.c,v 1.10 1995/04/28 18:17:29 ache Exp $
+ * kern_prot.c,v 1.11 1995/04/29 11:46:15 ache Exp
  */
 
 /*
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 732888d78769..4ec027254d16 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_resource.c,v 1.11 1995/02/20 19:42:33 guido Exp $
+ * kern_resource.c,v 1.12 1995/05/30 08:05:39 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 28089127b82e..8d488f123641 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.10 1995/03/16 18:12:35 bde Exp $
+ * kern_sig.c,v 1.11 1995/05/30 08:05:40 rgrimes Exp
  */
 
 #define	SIGPROP		/* include signal properties table */
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index a89ad533fc59..c54ac16b9e98 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.7 1995/04/30 05:11:46 davidg Exp $
+ * kern_subr.c,v 1.8 1995/05/08 23:11:12 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 534e477d303f..b9293a7dc59e 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_synch.c,v 1.10 1995/03/16 18:12:36 bde Exp $
+ * kern_synch.c,v 1.11 1995/05/30 08:05:44 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index cec5d558d392..41fff041470a 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.24 1995/05/12 19:17:31 wollman Exp $
+ * kern_sysctl.c,v 1.25 1995/05/30 08:05:46 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 319b00ac5783..ee955a3ceb9f 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.7 1995/03/16 18:12:38 bde Exp $
+ * kern_time.c,v 1.8 1995/05/30 08:05:47 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 23439a01ae92..6e8716d3788d 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
- * $Id: kern_xxx.c,v 1.9 1994/12/04 19:58:43 phk Exp $
+ * kern_xxx.c,v 1.10 1995/05/30 08:05:49 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index abe49ba9cbc2..7574e7c5c054 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $Id: makesyscalls.sh,v 1.11 1995/02/14 19:22:29 sos Exp $
+# makesyscalls.sh,v 1.12 1995/03/16 18:12:39 bde Exp
 
 set -e
 
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index f48ce99f0a37..278e63db8058 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -41,7 +41,7 @@
  *
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
- * $Id$
+ * subr_autoconf.c,v 1.2 1994/08/02 07:42:26 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 618f4f40564a..c578d4af16ef 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.13 1995/05/24 23:33:42 davidg Exp $
+ *	subr_diskslice.c,v 1.14 1995/05/30 08:05:51 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index d4e181ef6976..25f62aa47681 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.7 1995/04/29 11:36:47 jkh Exp $
+ * subr_log.c,v 1.8 1995/05/30 08:05:52 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index cc52cbbf639e..3324480e32c6 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $Id: subr_prf.c,v 1.12 1995/04/01 20:18:43 joerg Exp $
+ * subr_prf.c,v 1.13 1995/04/08 21:32:11 joerg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 3c8ef387223e..45d8a76692ce 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id: subr_prof.c,v 1.5 1995/01/29 03:03:23 bde Exp $
+ * subr_prof.c,v 1.6 1995/03/16 18:12:41 bde Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 0bc6f4cc4eb5..c73211af479b 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,7 +54,7 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- *	$Id: subr_rlist.c,v 1.9 1995/03/16 18:12:41 bde Exp $
+ *	subr_rlist.c,v 1.10 1995/05/30 08:05:54 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index e866b8aaf908..3160bc1c05a8 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * subr_xxx.c,v 1.3 1994/08/02 07:42:36 davidg Exp
  */
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index d4641221b98a..2361d68352eb 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.12 1995/04/13 18:24:33 davidg Exp $
+ * sys_generic.c,v 1.13 1995/05/30 08:05:56 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 4a01c60cdfb2..ea25d529429b 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.13 1995/05/12 21:39:48 davidg Exp $
+ *	sys_process.c,v 1.14 1995/05/30 08:05:58 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 92cbedc4b504..da3ee7b07c7d 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.4 1994/10/02 17:35:25 phk Exp $
+ * sys_socket.c,v 1.5 1995/05/30 08:05:59 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 3b9f75c424f0..f568eb5e0f53 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: syscalls.master,v 1.14 1995/03/25 16:52:11 davidg Exp $
+ * created from	syscalls.c,v 1.19 1995/04/23 12:20:50 ache Exp
  */
 
 char *syscallnames[] = {
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 1b14370c7abb..2c160df126b7 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.14 1995/03/25 16:52:11 davidg Exp $
+	syscalls.master,v 1.15 1995/04/23 12:20:52 ache Exp
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index f0e907b903d9..2317d46ac648 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -1,4 +1,4 @@
-/*	$Id$ */
+/*	sysv_ipc.c,v 1.1 1994/09/13 14:46:55 dfr Exp */
 /*	$NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $	*/
 
 /*
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 4444f6e6acf4..c7e6a8b3eca7 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_msg.c,v 1.3 1994/10/02 17:35:26 phk Exp $ */
+/*	sysv_msg.c,v 1.4 1995/05/30 08:06:01 rgrimes Exp */
 
 /*
  * Implementation of SVID messages
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 0be0e3474517..350aaba72f66 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_sem.c,v 1.4 1994/10/06 21:06:32 davidg Exp $ */
+/*	sysv_sem.c,v 1.5 1995/05/30 08:06:02 rgrimes Exp */
 
 /*
  * Implementation of SVID semaphores
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index de8379c2dd62..da566718b582 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.4 1995/02/20 22:23:13 davidg Exp $ */
+/*	sysv_shm.c,v 1.5 1995/05/30 08:06:04 rgrimes Exp */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index ffd61630f927..7f2af2716872 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.45.2.2 1995/06/04 16:45:21 davidg Exp $
+ * tty.c,v 1.45.2.3 1995/06/05 01:23:10 davidg Exp
  */
 
 #include "snp.h"
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 9b4b73129bad..b61e249eb7dc 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
- * $Id: tty_compat.c,v 1.12 1995/04/11 17:54:25 ache Exp $
+ * tty_compat.c,v 1.13 1995/05/30 08:06:09 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index c2acc9b35644..1c1ddce12fca 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_conf.c	8.4 (Berkeley) 1/21/94
- * $Id: tty_conf.c,v 1.5 1995/03/21 11:23:58 dufault Exp $
+ * tty_conf.c,v 1.6 1995/05/30 08:06:10 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 182efaef26c3..5ec443799df9 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_pty.c,v 1.10 1995/04/10 01:45:43 ache Exp $
+ * tty_pty.c,v 1.11 1995/05/30 08:06:14 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 527b4393c94b..fd06d91591ff 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: tty_subr.c,v 1.9 1994/11/26 19:23:50 bde Exp $
+ * tty_subr.c,v 1.10 1995/05/30 08:06:18 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c
index 8f4c84c66383..d270ecf384ba 100644
--- a/sys/kern/tty_tb.c
+++ b/sys/kern/tty_tb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tb.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * tty_tb.c,v 1.2 1994/08/02 07:42:55 davidg Exp
  */
 
 #include "tb.h"
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 9fe7f33e0b90..b8c3bf69a0ba 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.4 1994/12/04 01:46:13 ache Exp $
+ * tty_tty.c,v 1.5 1995/05/30 08:06:19 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index f387f998af17..5cb76ea7aea5 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id: uipc_domain.c,v 1.5 1995/05/11 00:13:04 wollman Exp $
+ * uipc_domain.c,v 1.6 1995/05/11 00:16:44 wollman Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index d71ff9f7db5a..98abf4e510f7 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.8 1995/02/23 19:10:21 davidg Exp $
+ * uipc_mbuf.c,v 1.9 1995/03/15 07:51:53 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 0b72465d1d6c..c6909361bef3 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.2 1994/08/02 07:43:04 davidg Exp $
+ * uipc_proto.c,v 1.3 1995/05/11 00:13:05 wollman Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 90346e236672..b033efb94062 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- * $Id: uipc_socket.c,v 1.9 1995/02/16 01:07:43 wollman Exp $
+ * uipc_socket.c,v 1.10 1995/05/30 08:06:21 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 3f7d082dd68d..ce8c3845c8b3 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.4 1994/10/02 17:35:33 phk Exp $
+ * uipc_socket2.c,v 1.5 1995/05/30 08:06:22 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 7c0864e5170d..67d28d106230 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.5 1995/03/16 18:12:46 bde Exp $
+ * uipc_syscalls.c,v 1.6 1995/05/30 08:06:24 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index a54a46a20dae..22ef5d13e4bf 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.8 1995/05/11 00:13:06 wollman Exp $
+ *	uipc_usrreq.c,v 1.9 1995/05/30 08:06:25 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index e7ac981c3e00..19b58cc27d0a 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.45 1995/05/21 21:38:49 davidg Exp $
+ * vfs_bio.c,v 1.46 1995/05/30 08:06:27 rgrimes Exp
  */
 
 /*
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index a05b4a0d2ca3..c27fbc260d75 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.3 (Berkeley) 8/22/94
- * $Id: vfs_cache.c,v 1.14 1995/04/15 00:49:35 davidg Exp $
+ * vfs_cache.c,v 1.15 1995/05/30 08:06:28 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 89a0c1b9c74e..cfa4a90d730a 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.15 1995/04/04 02:10:17 davidg Exp $
+ * vfs_cluster.c,v 1.16 1995/05/30 08:06:30 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 251d704e176c..849313742a68 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.5 1994/09/21 03:46:47 wollman Exp $
+ * vfs_conf.c,v 1.6 1994/11/12 01:47:43 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index ad1272142241..cf1e518360a8 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.9 1994/10/20 00:48:28 wollman Exp $
+ * vfs_init.c,v 1.10 1995/05/30 08:06:32 rgrimes Exp
  */
 
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index b25745c4ef47..415d6ef52d79 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.6 1994/10/06 21:06:36 davidg Exp $
+ * vfs_lookup.c,v 1.7 1995/05/30 08:06:33 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 710b3cb9dd7a..302a1f37cdb9 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.29 1995/05/12 04:24:53 davidg Exp $
+ * vfs_subr.c,v 1.30 1995/05/21 21:38:51 davidg Exp
  */
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 7b4c9fec3b2c..c7ba53438c9e 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.24 1995/05/15 08:39:31 davidg Exp $
+ * vfs_syscalls.c,v 1.25 1995/05/21 21:38:52 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index bdd88d53938f..06533a0e6e8b 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.10 1995/05/10 18:59:11 davidg Exp $
+ * vfs_vnops.c,v 1.11 1995/05/30 08:06:35 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh
index 339e65894371..73335e1816be 100644
--- a/sys/kern/vnode_if.sh
+++ b/sys/kern/vnode_if.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id$
+# vnode_if.sh,v 1.2 1994/08/02 07:43:34 davidg Exp
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 4e36675e5884..9bf730999189 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.3 (Berkeley) 2/3/94
-# $Id: vnode_if.src,v 1.2 1994/08/02 07:43:37 davidg Exp $
+# vnode_if.src,v 1.3 1994/09/28 16:45:12 dfr Exp
 #
 vop_lookup {
 	IN struct vnode *dvp;
diff --git a/sys/libkern/Makefile b/sys/libkern/Makefile
index 60dc3a01ba12..868cb6ba1de4 100644
--- a/sys/libkern/Makefile
+++ b/sys/libkern/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	7.9 (Berkeley) 6/1/93
-# $Id: Makefile,v 1.8 1995/03/16 17:32:20 wollman Exp $
+# Makefile,v 1.9 1995/03/23 07:02:14 rgrimes Exp
 
 .undef NOPROFILE
 
diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c
index 38b9df95e66b..6fa1692178eb 100644
--- a/sys/libkern/adddi3.c
+++ b/sys/libkern/adddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * adddi3.c,v 1.2 1994/08/02 07:43:42 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c
index 9f92718ea670..92aedded076d 100644
--- a/sys/libkern/anddi3.c
+++ b/sys/libkern/anddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * anddi3.c,v 1.2 1994/08/02 07:43:44 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 74fa0fdcdbce..d670d2bd3d4a 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * ashldi3.c,v 1.2 1994/08/02 07:43:46 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 51b9da5fefdf..1087120d31bf 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * ashrdi3.c,v 1.2 1994/08/02 07:43:48 davidg Exp
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index de9449b46717..300ac908088a 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * bcmp.c,v 1.2 1994/08/02 07:43:50 davidg Exp
  */
 
 #include <string.h>
diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c
index 238bd4eb743e..f9b4632e6c3d 100644
--- a/sys/libkern/cmpdi2.c
+++ b/sys/libkern/cmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * cmpdi2.c,v 1.2 1994/08/02 07:43:53 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index f6687f9c9601..d4e4d8e0f351 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * divdi3.c,v 1.2 1994/08/02 07:43:54 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 74e24502caee..f4c17e9d191f 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * ffs.c,v 1.2 1994/08/02 07:43:57 davidg Exp
  */
 
 #include <string.h>
diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c
index 2819cf8e5a0a..8473c31c8bde 100644
--- a/sys/libkern/iordi3.c
+++ b/sys/libkern/iordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * iordi3.c,v 1.2 1994/08/02 07:44:00 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c
index 7a16e327ff2c..b4fd9a382598 100644
--- a/sys/libkern/locc.c
+++ b/sys/libkern/locc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locc.c	8.1 (Berkeley) 6/10/93
- * $Id: locc.c,v 1.2 1994/08/02 07:44:04 davidg Exp $
+ * locc.c,v 1.3 1995/03/17 06:15:38 phk Exp
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c
index 0aba85e00813..5733c29a135c 100644
--- a/sys/libkern/lshldi3.c
+++ b/sys/libkern/lshldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * lshldi3.c,v 1.2 1994/08/02 07:44:06 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index b93de210cec7..ef742701eb7a 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * lshrdi3.c,v 1.2 1994/08/02 07:44:08 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index fc3625b1974d..572271fb1b60 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: mcount.c,v 1.3 1994/09/15 15:41:48 paul Exp $
+ * mcount.c,v 1.4 1995/05/30 08:06:39 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index efb6f92a5387..1232f4353fcb 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * moddi3.c,v 1.2 1994/08/02 07:44:11 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c
index 96d100cbe712..8e863642499b 100644
--- a/sys/libkern/muldi3.c
+++ b/sys/libkern/muldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: muldi3.c,v 1.2 1994/08/02 07:44:13 davidg Exp $
+ * muldi3.c,v 1.3 1995/05/30 08:06:41 rgrimes Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c
index c4065e218d03..6ba40ff86932 100644
--- a/sys/libkern/negdi2.c
+++ b/sys/libkern/negdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * negdi2.c,v 1.2 1994/08/02 07:44:15 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c
index f451088c3500..e84abf51c44e 100644
--- a/sys/libkern/notdi2.c
+++ b/sys/libkern/notdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * notdi2.c,v 1.2 1994/08/02 07:44:17 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index a2a64c4a984f..09bfb2bb25df 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: qdivrem.c,v 1.2 1994/08/02 07:44:19 davidg Exp $
+ * qdivrem.c,v 1.3 1995/05/30 08:06:42 rgrimes Exp
  */
 
 /*
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index dadd02c8a0f9..09ae669c88f7 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $Id$
+ * quad.h,v 1.2 1994/08/02 07:44:21 davidg Exp
  */
 
 /*
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 08d316ea5c6f..fe72992858ea 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $Id: random.c,v 1.2 1994/08/02 07:44:23 davidg Exp $
+ * random.c,v 1.3 1995/03/17 06:15:39 phk Exp
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index bd661fbeb065..8f9506d30ed3 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * rindex.c,v 1.2 1994/08/02 07:44:25 davidg Exp
  */
 
 #include <stddef.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index c44a6a62599a..7e35f39dcd73 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)scanc.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: scanc.c,v 1.2 1994/08/02 07:44:27 davidg Exp $
+ * scanc.c,v 1.3 1995/03/17 06:15:39 phk Exp
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 0663e44f6a76..27544592ec3c 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)skpc.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: skpc.c,v 1.2 1994/08/02 07:44:29 davidg Exp $
+ * skpc.c,v 1.3 1995/03/17 06:15:40 phk Exp
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 07e79231ddb5..824ac2b3fe3d 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * strcat.c,v 1.2 1994/08/02 07:44:31 davidg Exp
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index c9c397b57124..f53f8e0c6b36 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * strcmp.c,v 1.2 1994/08/02 07:44:33 davidg Exp
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 2715720e3d23..57d539a3494a 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * strcpy.c,v 1.2 1994/08/02 07:44:36 davidg Exp
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 1d1352c09e6b..96fbc9a4f369 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * strlen.c,v 1.2 1994/08/02 07:44:38 davidg Exp
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 8aea6908849d..5bc058159212 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * strncpy.c,v 1.2 1994/08/02 07:44:39 davidg Exp
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c
index cb54477a4d45..0605d461d8b2 100644
--- a/sys/libkern/subdi3.c
+++ b/sys/libkern/subdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * subdi3.c,v 1.2 1994/08/02 07:44:41 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 4aa3e50637dd..1d94e4ecff9c 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * ucmpdi2.c,v 1.2 1994/08/02 07:44:43 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index f9a77ec432c7..fe5b83ab3029 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * udivdi3.c,v 1.2 1994/08/02 07:44:44 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index ccd457d0adce..7ad65b9d4f7b 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * umoddi3.c,v 1.2 1994/08/02 07:44:46 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c
index e49190902a22..9f798fe4dfad 100644
--- a/sys/libkern/xordi3.c
+++ b/sys/libkern/xordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * xordi3.c,v 1.2 1994/08/02 07:44:48 davidg Exp
  */
 
 #include "quad.h"
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index d701c33152d8..5d761426e160 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.5 1994/10/06 21:06:40 davidg Exp $
+ * dead_vnops.c,v 1.6 1994/10/08 22:37:00 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/devfs/devfs_back.c b/sys/miscfs/devfs/devfs_back.c
index 5e615cb7b228..b30b2db7099c 100644
--- a/sys/miscfs/devfs/devfs_back.c
+++ b/sys/miscfs/devfs/devfs_back.c
@@ -2,7 +2,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_back.c,v 1.2 1995/04/20 07:34:51 julian Exp $
+ *	/home/ncvs/src/sys/miscfs/devfs/devfs_back.c,v 1.3 1995/05/30 08:06:49 rgrimes Exp
  */
 
 #include "param.h"
diff --git a/sys/miscfs/devfs/devfs_front.c b/sys/miscfs/devfs/devfs_front.c
index a3d02554ccc7..0949ae08e508 100644
--- a/sys/miscfs/devfs/devfs_front.c
+++ b/sys/miscfs/devfs/devfs_front.c
@@ -1,7 +1,7 @@
 /*
  * Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_front.c,v 1.3 1995/04/20 07:42:41 julian Exp $
+ *	/home/ncvs/src/sys/miscfs/devfs/devfs_front.c,v 1.4 1995/05/30 08:06:50 rgrimes Exp
  *
  */
 
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index 5781df7058c6..6d0506b1bafa 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -1,7 +1,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.2 1995/04/20 07:34:53 julian Exp $
+ *	/home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.3 1995/05/30 08:06:52 rgrimes Exp
  *
  *
  */
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 5deda3e88d45..950434e253e9 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -1,7 +1,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.4 1995/05/03 23:04:26 julian Exp $
+ *	/home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.5 1995/05/30 08:06:53 rgrimes Exp
  *
  * symlinks can wait 'til later.
  */
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index c6216e208d5c..c0b4f72c3fc1 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -7,7 +7,7 @@
 /*
  * Written by Julian Elischer (julian@DIALIX.oz.au)
  *
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.3 1995/05/03 23:06:31 julian Exp $
+ * /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.4 1995/05/30 08:06:55 rgrimes Exp
  */
 
 /* first a couple of defines for compatibility with inodes */
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index 4c682e7bd370..185e126b3a99 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp $
+ * fdesc.h,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp
  */
 
 #ifdef KERNEL
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index f44158e04e69..9c14c7c8d847 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.3 1995/03/16 18:13:05 bde Exp $
+ * fdesc_vfsops.c,v 1.4 1995/03/16 20:23:38 wollman Exp
  */
 
 /*
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 420320acab7e..75cb94f0e0dd 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.8 1995/03/28 07:56:44 bde Exp $
+ * fdesc_vnops.c,v 1.9 1995/05/30 08:06:57 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index 3f2d8ef714e1..0b383c4818ec 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id: fifo.h,v 1.4 1995/02/14 06:30:18 phk Exp $
+ * fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp
  */
 
 extern int	(**fifo_vnodeop_p)();
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 106ac89661ca..df818298c7bf 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.8 1995/03/16 18:13:13 bde Exp $
+ * fifo_vnops.c,v 1.9 1995/05/30 08:06:59 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index 2def608e55fc..338fd4bf7d6e 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * kernfs.h,v 1.2 1994/08/02 07:44:59 davidg Exp
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index e6f97c700f91..3640e5c10816 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.4 (Berkeley) 1/21/94
- * $Id: kernfs_vfsops.c,v 1.8 1995/03/16 20:23:38 wollman Exp $
+ * kernfs_vfsops.c,v 1.9 1995/05/25 01:35:15 davidg Exp
  */
 
 /*
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index a9bf9e713675..37bcfcfd419e 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.6 (Berkeley) 2/10/94
- * $Id: kernfs_vnops.c,v 1.7 1994/11/15 20:30:56 jkh Exp $
+ * kernfs_vnops.c,v 1.8 1995/05/25 01:35:16 davidg Exp
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 14286ffeee0c..cc7e3d97abcf 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.2 (Berkeley) 1/21/94
  *
- * $Id: lofs.h,v 1.8 1992/05/30 10:05:43 jsp Exp jsp $
+ * null.h,v 1.1.1.1 1994/05/24 10:05:04 rgrimes Exp
  */
 
 struct null_args {
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 8d18ffdc9e71..44587490fc40 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_subr.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: null_subr.c,v 1.2 1994/05/25 09:08:00 rgrimes Exp $
+ * null_subr.c,v 1.3 1994/10/02 17:48:14 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index eb1a19231c7d..516466b0ce4d 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.6 1995/03/16 20:23:39 wollman Exp $
+ * null_vfsops.c,v 1.7 1995/05/30 08:07:01 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 464d15aa6246..ce3a6f599894 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $
+ * null_vnops.c,v 1.8 1995/05/30 08:07:03 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index 38d7ee0cdd27..1133844bcc2a 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.3 1992/05/30 10:05:24 jsp Exp jsp $
+ * portal.h,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp
  */
 
 struct portal_args {
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 52c7bcf6094e..e77eaa338d15 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.7 1995/03/16 20:23:41 wollman Exp $
+ * portal_vfsops.c,v 1.8 1995/05/30 08:07:05 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 41fd2de3f416..f3f488ac1da4 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.5 1995/03/28 07:57:02 bde Exp $
+ * portal_vnops.c,v 1.6 1995/05/30 08:07:06 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/procfs/README b/sys/miscfs/procfs/README
index 38811b3f6e3a..6234870f02ce 100644
--- a/sys/miscfs/procfs/README
+++ b/sys/miscfs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$Id: README,v 3.1 1993/12/15 09:40:17 jsp Exp $
+README,v 1.1.1.1 1994/05/24 10:05:10 rgrimes Exp
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 22c3800b930d..591f8957d309 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs.h	8.6 (Berkeley) 2/3/94
  *
- *	$Id: procfs.h,v 1.4 1995/04/15 02:30:08 davidg Exp $
+ *	procfs.h,v 1.5 1995/05/25 01:35:22 davidg Exp
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 5befe23d576d..3f718ec40d1a 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_ctl.c	8.3 (Berkeley) 1/21/94
  *
- *	$Id: procfs_ctl.c,v 1.4 1995/02/20 15:53:32 davidg Exp $
+ *	procfs_ctl.c,v 1.5 1995/03/16 18:13:46 bde Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index 331a671279e2..8f562204867a 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_fpregs.c	8.1 (Berkeley) 1/27/94
  *
- *	$Id: procfs_fpregs.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
+ *	procfs_fpregs.c,v 1.2 1994/08/02 07:45:12 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 0f1b3b02f96d..b80dce47eb9d 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.4 (Berkeley) 1/21/94
  *
- *	$Id: procfs_mem.c,v 1.6 1995/01/05 03:59:38 davidg Exp $
+ *	procfs_mem.c,v 1.7 1995/05/30 08:07:09 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c
index a7699f29e123..48d3ff8bf9c3 100644
--- a/sys/miscfs/procfs/procfs_note.c
+++ b/sys/miscfs/procfs/procfs_note.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- *	$Id: procfs_note.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
+ *	procfs_note.c,v 1.2 1994/08/02 07:45:16 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index 8b0600a480d0..e15eba8379d3 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_regs.c	8.3 (Berkeley) 1/27/94
  *
- *	$Id: procfs_regs.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
+ *	procfs_regs.c,v 1.2 1994/08/02 07:45:18 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index f1290222d06b..6c008c015966 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_status.c,v 1.3 1994/10/10 07:55:38 phk Exp $
+ *	procfs_status.c,v 1.4 1995/05/30 08:07:10 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index 6c464c1bdb77..1be177a1b547 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.4 (Berkeley) 1/27/94
  *
- *	$Id: procfs_subr.c,v 1.4 1995/04/15 02:30:12 davidg Exp $
+ *	procfs_subr.c,v 1.5 1995/05/30 08:07:11 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 4113063218c3..a4295cbb6ba9 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- *	$Id: procfs_vfsops.c,v 1.9 1995/03/16 20:23:42 wollman Exp $
+ *	procfs_vfsops.c,v 1.10 1995/05/25 01:35:23 davidg Exp
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 738df27cadf9..a33997fc6b0c 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.6 (Berkeley) 2/7/94
  *
- *	$Id: procfs_vnops.c,v 1.13 1995/05/25 01:35:24 davidg Exp $
+ *	procfs_vnops.c,v 1.14 1995/05/30 08:07:13 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 60ca99981917..272bfb9dcafd 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.10 1995/02/03 06:46:21 davidg Exp $
+ * spec_vnops.c,v 1.11 1995/04/09 06:03:10 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index bc26f9d59d12..547d5f391295 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)specdev.h	8.2 (Berkeley) 2/2/94
- * $Id$
+ * specdev.h,v 1.2 1994/08/02 07:45:30 davidg Exp
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 5be2e5eed466..6ac9030f78ea 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $
+ * umap.h,v 1.3 1995/05/30 08:07:15 rgrimes Exp
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 792f4a87b05e..7a6f5d52d081 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.6 (Berkeley) 1/26/94
  *
- * $Id: umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp $
+ * umap_subr.c,v 1.4 1995/05/30 08:07:17 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 64f05bbd62d6..a82cf96551fa 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap_vfsops.c,v 1.7 1995/03/16 20:23:43 wollman Exp $
+ * umap_vfsops.c,v 1.8 1995/05/30 08:07:18 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index a82d1c6d327b..52f7915aa307 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.3 (Berkeley) 1/5/94
- * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $
+ * umap_vnops.c,v 1.9 1995/05/30 08:07:22 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/union/libc.opendir.c b/sys/miscfs/union/libc.opendir.c
index 15e3a0ce7637..e069addf1d7b 100644
--- a/sys/miscfs/union/libc.opendir.c
+++ b/sys/miscfs/union/libc.opendir.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * libc.opendir.c,v 1.2 1994/08/02 07:45:40 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 05fa4814086a..fb528a5c91c6 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.2 (Berkeley) 2/17/94
- * $Id: union.h,v 1.2 1994/08/02 07:45:42 davidg Exp $
+ * union.h,v 1.3 1995/03/16 18:14:02 bde Exp
  */
 
 struct union_args {
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index cbbd17111bbc..f0293b30821a 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.4 (Berkeley) 2/17/94
- * $Id: union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp $
+ * union_subr.c,v 1.6 1995/05/30 08:07:25 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 670c7ce98d90..443464a03444 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.7 (Berkeley) 3/5/94
- * $Id: union_vfsops.c,v 1.9 1995/03/16 20:23:44 wollman Exp $
+ * union_vfsops.c,v 1.10 1995/05/30 08:07:26 rgrimes Exp
  */
 
 /*
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index df1935b1651e..100ca735db67 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.7 1994/10/10 07:55:48 phk Exp $
+ * union_vnops.c,v 1.8 1994/11/04 14:41:46 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h
index f83b9ec0b1a1..88e892443423 100644
--- a/sys/msdosfs/bootsect.h
+++ b/sys/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/*	$Id: bootsect.h,v 1.1 1994/09/19 15:41:36 dfr Exp $ */
+/*	bootsect.h,v 1.2 1995/05/30 08:07:29 rgrimes Exp */
 /*	$NetBSD: bootsect.h,v 1.4 1994/06/29 06:35:28 cgd Exp $	*/
 
 /*
diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h
index 7618126c3101..f0f9686cfd55 100644
--- a/sys/msdosfs/bpb.h
+++ b/sys/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp $ */
+/*	bpb.h,v 1.2 1995/05/30 08:07:30 rgrimes Exp */
 /*	$NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $	*/
 
 /*
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index a7f2928ec8c5..8a0d1fe860e6 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.4 1995/03/16 18:14:17 bde Exp $ */
+/*	denode.h,v 1.5 1995/05/30 08:07:32 rgrimes Exp */
 /*	$NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h
index f4eecac02d97..405005d5166b 100644
--- a/sys/msdosfs/direntry.h
+++ b/sys/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/*	$Id: direntry.h,v 1.1 1994/09/19 15:41:39 dfr Exp $ */
+/*	direntry.h,v 1.2 1995/05/30 08:07:33 rgrimes Exp */
 /*	$NetBSD: direntry.h,v 1.7 1994/08/21 18:43:54 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h
index 3b043c14d230..f91e18f0c443 100644
--- a/sys/msdosfs/fat.h
+++ b/sys/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/*	$Id: fat.h,v 1.2 1994/09/27 20:42:41 phk Exp $ */
+/*	fat.h,v 1.3 1995/05/30 08:07:34 rgrimes Exp */
 /*	$NetBSD: fat.h,v 1.4 1994/08/21 18:43:57 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c
index 88999827db52..22f6e6bb709d 100644
--- a/sys/msdosfs/msdosfs_conv.c
+++ b/sys/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_conv.c,v 1.4 1995/03/29 18:48:06 ache Exp $ */
+/*	msdosfs_conv.c,v 1.5 1995/05/30 08:07:36 rgrimes Exp */
 /*	$NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $	*/
 
 /*
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 60a68111833d..760105806609 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.11 1995/04/11 17:13:17 bde Exp $ */
+/*	msdosfs_denode.c,v 1.12 1995/05/30 08:07:37 rgrimes Exp */
 /*	$NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index b43f9595b6b5..e36f88255b16 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.6 1995/04/11 16:43:20 bde Exp $ */
+/*	msdosfs_fat.c,v 1.7 1995/05/30 08:07:40 rgrimes Exp */
 /*	$NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index a80e5ae7bac3..d2b6c02edae2 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_lookup.c,v 1.3 1995/05/09 16:30:44 bde Exp $ */
+/*	msdosfs_lookup.c,v 1.4 1995/05/30 08:07:41 rgrimes Exp */
 /*	$NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index bbb4fc6d2769..ef6e439c5ef7 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.6 1994/12/12 12:35:47 bde Exp $ */
+/*	msdosfs_vfsops.c,v 1.7 1995/05/30 08:07:43 rgrimes Exp */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 653ae096804d..6738011b5b2d 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.16.2.2 1995/06/02 11:01:07 davidg Exp $ */
+/*	msdosfs_vnops.c,v 1.16.2.3 1995/06/02 11:03:15 davidg Exp */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 5309acbd0851..6f034805595c 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.2 1994/09/27 20:42:59 phk Exp $ */
+/*	msdosfsmount.h,v 1.3 1995/05/30 08:07:47 rgrimes Exp */
 /*	$NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $	*/
 
 /*-
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index c11a4cf1168b..d8247e9aebae 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.6 1995/05/09 13:35:38 davidg Exp $
+ * bpf.c,v 1.7 1995/05/30 08:07:50 rgrimes Exp
  */
 
 #include "bpfilter.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 2da90b0d874d..9102eea8a92c 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf.h,v 1.3 1994/08/21 05:11:38 paul Exp $
+ * bpf.h,v 1.4 1995/05/30 08:07:52 rgrimes Exp
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 44dab52e0c9d..d18ce4ce81e1 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $Id: bpf_compat.h,v 1.2 1994/08/02 07:45:56 davidg Exp $
+ * bpf_compat.h,v 1.3 1994/08/21 05:11:39 paul Exp
  */
 
 #ifndef _NET_BPF_COMPAT_H_
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 076f25577060..79a8dd947034 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf_filter.c,v 1.4 1995/04/01 01:46:27 davidg Exp $
+ * bpf_filter.c,v 1.5 1995/05/30 08:07:56 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 598ce9e2337c..b475297f4ba1 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpfdesc.h,v 1.3 1994/08/02 07:46:00 davidg Exp $
+ * bpfdesc.h,v 1.4 1994/08/21 05:11:39 paul Exp
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/if.c b/sys/net/if.c
index 27d61494bbca..9f94072865b2 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $Id: if.c,v 1.14 1995/05/27 04:37:24 davidg Exp $
+ * if.c,v 1.15 1995/05/30 08:07:58 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if.h b/sys/net/if.h
index 9e898fb50bcd..3cde72f0b50a 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id: if.h,v 1.17 1995/04/26 18:10:44 pst Exp $
+ * if.h,v 1.18 1995/05/30 08:07:59 rgrimes Exp
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 151511094301..e8aa85606267 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id: if_arp.h,v 1.4 1994/11/15 14:41:38 bde Exp $
+ * if_arp.h,v 1.5 1994/11/16 02:15:05 phk Exp
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 7e8053130c25..0aa10d270488 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.3 1995/03/20 19:20:39 wollman Exp $
+ *	if_disc.c,v 1.4 1995/05/30 08:08:01 rgrimes Exp
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index e76b88ad1f67..d7d41e71ab85 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id: if_dl.h,v 1.3 1994/08/21 05:11:41 paul Exp $
+ * if_dl.h,v 1.4 1995/05/30 08:08:02 rgrimes Exp
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index e2f36f11db5d..f251620039f7 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.8 1995/05/30 08:08:03 rgrimes Exp $
+ * if_ethersubr.c,v 1.8.2.1 1995/06/03 04:46:21 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 41ea156800c9..025a8f20918e 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.4 1995/05/09 13:35:40 davidg Exp $
+ * if_fddisubr.c,v 1.5 1995/05/30 08:08:05 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index da89ee7126f7..033bdbbecdbb 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id: if_llc.h,v 1.2 1994/08/02 07:46:16 davidg Exp $
+ * if_llc.h,v 1.3 1994/08/21 05:11:42 paul Exp
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 7673f7e1e2a3..367b0bb9ec05 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.9 1995/04/26 18:10:45 pst Exp $
+ * if_loop.c,v 1.10 1995/05/30 08:08:06 rgrimes Exp
  */
 
 /*
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index b1ff84a4e2b3..e5cbbcdc30fb 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.13 1995/05/30 08:08:08 rgrimes Exp $ */
+/* if_ppp.c,v 1.13.2.1 1995/06/04 16:12:49 davidg Exp */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
 #include "ppp.h"
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index 97df728e1a7e..ec445c4df630 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_ppp.h,v 1.2 1994/09/23 00:13:20 wollman Exp $
+ * if_ppp.h,v 1.3 1995/05/30 08:08:09 rgrimes Exp
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 6ddd8783590e..3f0b065c69d2 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.19 1995/04/28 18:47:28 ache Exp $
+ * if_sl.c,v 1.20 1995/05/30 08:08:11 rgrimes Exp
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index ade190ff7157..d10211617be4 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $Id: if_slvar.h,v 1.5 1995/03/30 20:43:32 ache Exp $
+ * if_slvar.h,v 1.6 1995/05/30 08:08:13 rgrimes Exp
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 9a573612b2d4..4745f02fbada 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $Id: if_types.h,v 1.3 1994/08/21 05:11:43 paul Exp $
+ * if_types.h,v 1.4 1995/02/25 15:57:55 davidg Exp
  */
 
 #ifndef _NET_IF_TYPES_H_
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 35583483ce8f..1f66d96671dc 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id: netisr.h,v 1.5 1995/01/05 19:51:47 se Exp $
+ * netisr.h,v 1.6 1995/05/11 00:13:10 wollman Exp
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/pppcompress.c b/sys/net/pppcompress.c
index 5485b0fbb4cf..0628417eaed8 100644
--- a/sys/net/pppcompress.c
+++ b/sys/net/pppcompress.c
@@ -44,7 +44,7 @@
  * so that the entire packet being decompressed doesn't have
  * to be in contiguous memory (just the compressed header).
  *
- *	$Id: pppcompress.c,v 1.3 1994/11/01 09:03:20 pst Exp $
+ *	pppcompress.c,v 1.4 1995/05/30 08:08:17 rgrimes Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/net/pppcompress.h b/sys/net/pppcompress.h
index 93f3e510211d..37aaf3d46fe9 100644
--- a/sys/net/pppcompress.h
+++ b/sys/net/pppcompress.h
@@ -39,7 +39,7 @@
  *	- added sl_uncompress_tcp_part.
  *
  *	From: 	slcompress.h	7.4	90/06/28
- *	$Id: pppcompress.h,v 1.2 1994/09/23 00:13:22 wollman Exp $
+ *	pppcompress.h,v 1.3 1995/05/30 08:08:18 rgrimes Exp
  */
 
 #ifndef _NET_PPPCOMPRESS_H_
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 7073d604c8f1..7fd8c205aee0 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id: radix.c,v 1.8 1995/04/28 23:01:34 pst Exp $
+ *	radix.c,v 1.9 1995/05/30 08:08:20 rgrimes Exp
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index 2384936cc56b..57631d840a9f 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- *	$Id$
+ *	radix.h,v 1.8 1995/04/28 23:01:37 pst Exp
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index dfb08e41598c..90a3ac7dbc03 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.c,v 1.3 1994/10/08 22:38:24 phk Exp $
+ * raw_cb.c,v 1.4 1995/05/30 08:08:21 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index e975432e2180..83de81e38f04 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.h,v 1.2 1994/08/02 07:46:36 davidg Exp $
+ * raw_cb.h,v 1.3 1994/08/21 05:11:46 paul Exp
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index bf6f6bbdb433..6ded2b36b5b3 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: raw_usrreq.c,v 1.5 1995/02/16 01:11:38 wollman Exp $
+ * raw_usrreq.c,v 1.6 1995/05/30 08:08:22 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index ca705b568fdd..40c857133559 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.22 1995/04/25 19:12:07 wollman Exp $
+ *	route.c,v 1.23 1995/05/30 08:08:24 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.h b/sys/net/route.h
index e12f986986e8..731dab7ac160 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.13 1995/03/20 21:30:21 wollman Exp $
+ * route.h,v 1.14 1995/05/30 08:08:26 rgrimes Exp
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 7e65578dc12e..7f5f57cb96df 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.12 1995/05/15 22:57:53 davidg Exp $
+ *	rtsock.c,v 1.13 1995/05/30 08:08:31 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 5630b51b64fe..80e8a5408310 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $Id: slcompress.c,v 1.4 1994/10/08 22:38:27 phk Exp $
+ * slcompress.c,v 1.5 1995/05/30 08:08:33 rgrimes Exp
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 239f63327f13..695fd1354960 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -35,7 +35,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $Id: slcompress.h,v 1.5 1994/08/22 14:16:36 bde Exp $
+ * slcompress.h,v 1.6 1995/05/30 08:08:34 rgrimes Exp
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index d438d42a3c8b..08919bb71d31 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $Id: slip.h,v 1.5 1995/04/28 18:47:29 ache Exp $
+ * slip.h,v 1.6 1995/04/29 15:24:00 bde Exp
  */
 
 #ifndef _NET_SLIP_H_
diff --git a/sys/netccitt/ccitt_proto.c b/sys/netccitt/ccitt_proto.c
index b6b49b4579d8..53d0f72a9de3 100644
--- a/sys/netccitt/ccitt_proto.c
+++ b/sys/netccitt/ccitt_proto.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ccitt_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: ccitt_proto.c,v 1.2 1994/08/02 07:46:54 davidg Exp $
+ * ccitt_proto.c,v 1.3 1995/05/11 00:13:13 wollman Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/dll.h b/sys/netccitt/dll.h
index 005525b05f63..746892d5b628 100644
--- a/sys/netccitt/dll.h
+++ b/sys/netccitt/dll.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dll.h	8.1 (Berkeley) 6/10/93
- * $Id: dll.h,v 1.3 1994/08/21 05:44:06 paul Exp $
+ * dll.h,v 1.4 1995/05/30 08:08:37 rgrimes Exp
  */
 
 #ifndef _NETCCITT_DLL_H_
diff --git a/sys/netccitt/hd_debug.c b/sys/netccitt/hd_debug.c
index f368d420035a..2f5b87cb195b 100644
--- a/sys/netccitt/hd_debug.c
+++ b/sys/netccitt/hd_debug.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: hd_debug.c,v 1.3 1995/02/15 06:29:42 jkh Exp $
+ * hd_debug.c,v 1.4 1995/05/30 08:08:38 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_input.c b/sys/netccitt/hd_input.c
index 91fd2fe7bdfa..48c824b8c5c8 100644
--- a/sys/netccitt/hd_input.c
+++ b/sys/netccitt/hd_input.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_input.c	8.1 (Berkeley) 6/10/93
- * $Id: hd_input.c,v 1.4 1995/05/11 19:26:39 rgrimes Exp $
+ * hd_input.c,v 1.5 1995/05/30 08:08:40 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_output.c b/sys/netccitt/hd_output.c
index 903c27e507ca..e485de89a66e 100644
--- a/sys/netccitt/hd_output.c
+++ b/sys/netccitt/hd_output.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_output.c	8.1 (Berkeley) 6/10/93
- * $Id: hd_output.c,v 1.3 1995/02/15 06:29:44 jkh Exp $
+ * hd_output.c,v 1.4 1995/05/30 08:08:42 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_subr.c b/sys/netccitt/hd_subr.c
index c379188a8ce0..f2d33cf9351f 100644
--- a/sys/netccitt/hd_subr.c
+++ b/sys/netccitt/hd_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: hd_subr.c,v 1.3 1995/02/15 06:29:45 jkh Exp $
+ * hd_subr.c,v 1.4 1995/05/30 08:08:43 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_timer.c b/sys/netccitt/hd_timer.c
index 8764043c527a..1fc49ad8deee 100644
--- a/sys/netccitt/hd_timer.c
+++ b/sys/netccitt/hd_timer.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: hd_timer.c,v 1.3 1995/02/15 06:29:46 jkh Exp $
+ * hd_timer.c,v 1.4 1995/05/30 08:08:44 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h
index 24679ac32f77..b96bf99415d1 100644
--- a/sys/netccitt/hd_var.h
+++ b/sys/netccitt/hd_var.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_var.h	8.1 (Berkeley) 6/10/93
- * $Id: hd_var.h,v 1.2 1994/08/02 07:47:10 davidg Exp $
+ * hd_var.h,v 1.3 1994/08/21 05:44:06 paul Exp
  */
 
 #ifndef _NETCCITT_HD_VAR_H_
diff --git a/sys/netccitt/hdlc.h b/sys/netccitt/hdlc.h
index f7fd79359b20..ba3847afe92f 100644
--- a/sys/netccitt/hdlc.h
+++ b/sys/netccitt/hdlc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hdlc.h	8.1 (Berkeley) 6/10/93
- * $Id: hdlc.h,v 1.2 1994/08/02 07:47:12 davidg Exp $
+ * hdlc.h,v 1.3 1994/08/21 05:44:07 paul Exp
  */
 
 #ifndef _NETCCITT_HDLC_H_
diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c
index 7b85f4a3ee14..c55af3a6f295 100644
--- a/sys/netccitt/if_x25subr.c
+++ b/sys/netccitt/if_x25subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_x25subr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_x25subr.c,v 1.5 1995/04/26 18:10:50 pst Exp $
+ * if_x25subr.c,v 1.6 1995/05/30 08:08:46 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_input.c b/sys/netccitt/llc_input.c
index 18effc365c7c..cd98b17cbab5 100644
--- a/sys/netccitt/llc_input.c
+++ b/sys/netccitt/llc_input.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_input.c	8.1 (Berkeley) 6/10/93
- * $Id: llc_input.c,v 1.3 1994/12/13 22:32:13 wollman Exp $
+ * llc_input.c,v 1.4 1995/05/30 08:08:48 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_output.c b/sys/netccitt/llc_output.c
index 05cf9ae69975..26a9e669a425 100644
--- a/sys/netccitt/llc_output.c
+++ b/sys/netccitt/llc_output.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_output.c	8.1 (Berkeley) 6/10/93
- * $Id: llc_output.c,v 1.3 1995/03/19 14:29:00 davidg Exp $
+ * llc_output.c,v 1.4 1995/05/30 08:08:50 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_subr.c b/sys/netccitt/llc_subr.c
index 9699be643e21..66e4f10c1fab 100644
--- a/sys/netccitt/llc_subr.c
+++ b/sys/netccitt/llc_subr.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: llc_subr.c,v 1.4 1995/05/11 19:26:40 rgrimes Exp $
+ * llc_subr.c,v 1.5 1995/05/30 08:08:52 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_timer.c b/sys/netccitt/llc_timer.c
index 0714d51e3b94..c2ae2f41a6b7 100644
--- a/sys/netccitt/llc_timer.c
+++ b/sys/netccitt/llc_timer.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: llc_timer.c,v 1.2 1994/08/02 07:47:23 davidg Exp $
+ * llc_timer.c,v 1.3 1995/05/30 08:08:53 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_var.h b/sys/netccitt/llc_var.h
index 6de1aa28a02b..9bea917a3680 100644
--- a/sys/netccitt/llc_var.h
+++ b/sys/netccitt/llc_var.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_var.h	8.1 (Berkeley) 6/10/93
- * $Id: llc_var.h,v 1.3 1994/08/21 05:44:08 paul Exp $
+ * llc_var.h,v 1.4 1995/05/30 08:08:55 rgrimes Exp
  */
 
 #ifndef _NETCCITT_LLC_VAR_H_
diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h
index 50b9b091adcb..512c58784464 100644
--- a/sys/netccitt/pk.h
+++ b/sys/netccitt/pk.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk.h	8.1 (Berkeley) 6/10/93
- * $Id: pk.h,v 1.3 1994/08/21 05:44:09 paul Exp $
+ * pk.h,v 1.4 1995/05/30 08:08:57 rgrimes Exp
  */
 
 #ifndef _NETCCITT_PK_H_
diff --git a/sys/netccitt/pk_acct.c b/sys/netccitt/pk_acct.c
index d3ba5bc0c4b5..c43ae03ff059 100644
--- a/sys/netccitt/pk_acct.c
+++ b/sys/netccitt/pk_acct.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_acct.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_acct.c,v 1.2 1994/08/02 07:47:29 davidg Exp $
+ * pk_acct.c,v 1.3 1995/05/30 08:08:58 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_debug.c b/sys/netccitt/pk_debug.c
index 338d167b37f0..d70e8d515160 100644
--- a/sys/netccitt/pk_debug.c
+++ b/sys/netccitt/pk_debug.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * pk_debug.c,v 1.2 1994/08/02 07:47:31 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c
index 777de53c2f3b..f55e2e916118 100644
--- a/sys/netccitt/pk_input.c
+++ b/sys/netccitt/pk_input.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_input.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_input.c,v 1.4 1995/05/11 00:13:14 wollman Exp $
+ * pk_input.c,v 1.5 1995/05/30 08:08:59 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_llcsubr.c b/sys/netccitt/pk_llcsubr.c
index be18dafbcc72..3e13130b9484 100644
--- a/sys/netccitt/pk_llcsubr.c
+++ b/sys/netccitt/pk_llcsubr.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_llcsubr.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_llcsubr.c,v 1.3 1994/12/13 22:32:16 wollman Exp $
+ * pk_llcsubr.c,v 1.4 1995/05/30 08:09:04 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_output.c b/sys/netccitt/pk_output.c
index 7645502b2e00..d0f6e9d91dcf 100644
--- a/sys/netccitt/pk_output.c
+++ b/sys/netccitt/pk_output.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_output.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_output.c,v 1.2 1994/08/02 07:47:38 davidg Exp $
+ * pk_output.c,v 1.3 1995/05/30 08:09:05 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c
index a64375facb03..2b20af4aa502 100644
--- a/sys/netccitt/pk_subr.c
+++ b/sys/netccitt/pk_subr.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_subr.c,v 1.3 1994/12/13 22:32:17 wollman Exp $
+ * pk_subr.c,v 1.4 1995/05/30 08:09:07 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_timer.c b/sys/netccitt/pk_timer.c
index 72aea7783c33..37f56e197fee 100644
--- a/sys/netccitt/pk_timer.c
+++ b/sys/netccitt/pk_timer.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_timer.c,v 1.2 1994/08/02 07:47:44 davidg Exp $
+ * pk_timer.c,v 1.3 1995/05/30 08:09:08 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_usrreq.c b/sys/netccitt/pk_usrreq.c
index 84d6e2e1745d..446906b87e79 100644
--- a/sys/netccitt/pk_usrreq.c
+++ b/sys/netccitt/pk_usrreq.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_usrreq.c,v 1.2 1994/08/02 07:47:46 davidg Exp $
+ * pk_usrreq.c,v 1.3 1995/05/30 08:09:09 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h
index 6bfe7bd8d9e9..e1063f67acdb 100644
--- a/sys/netccitt/pk_var.h
+++ b/sys/netccitt/pk_var.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_var.h	8.1 (Berkeley) 6/10/93
- * $Id: pk_var.h,v 1.4 1995/03/16 18:14:40 bde Exp $
+ * pk_var.h,v 1.5 1995/05/30 08:09:11 rgrimes Exp
  */
 
 #ifndef _NETCCITT_PK_VAR_H_
diff --git a/sys/netccitt/x25.h b/sys/netccitt/x25.h
index bb9146043050..57b69dae2094 100644
--- a/sys/netccitt/x25.h
+++ b/sys/netccitt/x25.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)x25.h	8.1 (Berkeley) 6/10/93
- * $Id: x25.h,v 1.3 1994/08/21 05:44:11 paul Exp $
+ * x25.h,v 1.4 1995/05/30 08:09:12 rgrimes Exp
  */
 
 #ifndef _NETCCITT_X25_H_
diff --git a/sys/netccitt/x25acct.h b/sys/netccitt/x25acct.h
index a5ecdd21a91b..d788f44d7100 100644
--- a/sys/netccitt/x25acct.h
+++ b/sys/netccitt/x25acct.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)x25acct.h	8.1 (Berkeley) 6/10/93
- * $Id: x25acct.h,v 1.2 1994/08/02 07:47:52 davidg Exp $
+ * x25acct.h,v 1.3 1994/08/21 05:44:11 paul Exp
  */
 
 #ifndef _NETCCITT_X25ACCT_H_
diff --git a/sys/netccitt/x25err.h b/sys/netccitt/x25err.h
index 94cf7cd89e82..48f2e37e87a0 100644
--- a/sys/netccitt/x25err.h
+++ b/sys/netccitt/x25err.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)x25err.h	8.1 (Berkeley) 6/10/93
- * $Id: x25err.h,v 1.3 1994/08/21 05:44:12 paul Exp $
+ * x25err.h,v 1.4 1995/05/30 08:09:13 rgrimes Exp
  */
 
 #ifndef _NETCCITT_X25ERR_H_
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 90eeb4fbcd3f..7bdb4c21f2a5 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: icmp_var.h,v 1.3 1994/08/21 05:27:23 paul Exp $
+ * icmp_var.h,v 1.4 1995/02/16 00:27:40 wollman Exp
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 0beb5789408d..9d7685d9df7e 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.16 1995/05/11 00:13:16 wollman Exp $
+ * if_ether.c,v 1.17 1995/05/30 08:09:18 rgrimes Exp
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 2551fe378113..ed87dd9790af 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.h,v 1.8 1995/04/02 01:26:26 wpaul Exp $
+ * if_ether.h,v 1.9 1995/05/30 08:09:20 rgrimes Exp
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index 14ec34389f19..aec447f9433c 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id: if_fddi.h,v 1.1 1995/03/14 09:14:14 davidg Exp $
+ * if_fddi.h,v 1.2 1995/05/30 08:09:21 rgrimes Exp
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index dac0add159ba..98c84482bdde 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.10 1995/05/16 01:28:29 davidg Exp $
+ * igmp.c,v 1.11 1995/05/30 08:09:23 rgrimes Exp
  */
 
 /*
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 4011b4c8dcfa..42e4e1d958e8 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $Id: igmp.h,v 1.4 1994/09/06 22:42:17 wollman Exp $
+ * igmp.h,v 1.5 1995/05/30 08:09:24 rgrimes Exp
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 0de226c50ffe..93474d0e327b 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id: igmp_var.h,v 1.4 1994/09/06 22:42:17 wollman Exp $
+ * igmp_var.h,v 1.5 1995/02/16 00:27:42 wollman Exp
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 1ebbab3e34ef..7f972349576b 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.2 (Berkeley) 11/15/93
- * $Id: in.c,v 1.13 1995/04/26 18:10:54 pst Exp $
+ * in.c,v 1.14 1995/05/30 08:09:26 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index b9f8b1d4ed8c..ae2528c24391 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id: in.h,v 1.7 1995/02/14 23:04:50 wollman Exp $
+ * in.h,v 1.9 1995/03/16 18:22:26 wollman Exp
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 9f12495e6f76..db250545e66e 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id: in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp $
+ * in_cksum.c,v 1.3 1995/05/30 08:09:27 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 6f8fe0ea244a..c2e3868ac476 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
- * $Id: in_pcb.c,v 1.11 1995/05/03 07:16:51 davidg Exp $
+ * in_pcb.c,v 1.12 1995/05/30 08:09:28 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 248ad7afdbe7..f4362223d32a 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: in_pcb.h,v 1.7 1995/04/09 16:46:47 jkh Exp $
+ * in_pcb.h,v 1.8 1995/04/10 00:43:18 davidg Exp
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 1a5f6d90ab50..f580eb43133d 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)in_proto.c	8.1 (Berkeley) 6/10/93
- *	$Id: in_proto.c,v 1.14 1995/05/11 00:13:17 wollman Exp $
+ *	in_proto.c,v 1.15 1995/05/30 08:09:30 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 150d9892c94e..b629cc0d9ced 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: in_rmx.c,v 1.12 1995/03/19 14:29:01 davidg Exp $
+ * in_rmx.c,v 1.13 1995/05/30 08:09:31 rgrimes Exp
  */
 
 /*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index f35ab2ff1685..b5a92caf7fcb 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id: in_systm.h,v 1.2 1994/08/02 07:48:25 davidg Exp $
+ * in_systm.h,v 1.3 1994/08/21 05:27:29 paul Exp
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index a21ec47468f1..f25f7ae020f8 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $Id: in_var.h,v 1.9 1995/03/23 18:14:41 wollman Exp $
+ * in_var.h,v 1.10 1995/05/30 08:09:32 rgrimes Exp
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 864474a065b3..47efcadcd9f0 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.1 (Berkeley) 6/10/93
- * $Id: ip.h,v 1.4 1995/05/05 14:36:38 ache Exp $
+ * ip.h,v 1.5 1995/05/30 08:09:33 rgrimes Exp
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index d7b4a118d97f..a45e6c2ae853 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.6 1995/03/16 18:14:54 bde Exp $
+ * ip_icmp.c,v 1.7 1995/05/30 08:09:42 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index aa0e3e169ff6..c87375dac156 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_icmp.h,v 1.3 1994/08/21 05:27:31 paul Exp $
+ * ip_icmp.h,v 1.4 1995/05/30 08:09:43 rgrimes Exp
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 22a4f459076f..aeee30091a35 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.21 1995/05/11 00:13:18 wollman Exp $
+ * ip_input.c,v 1.22 1995/05/30 08:09:44 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 4c815e88a2fb..bcc555b79f6b 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_mroute.h,v 1.6 1995/03/16 18:14:59 bde Exp $
+ * ip_mroute.h,v 1.7 1995/05/30 08:09:48 rgrimes Exp
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 8e6fb565350c..173742c8fa4f 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- * $Id: ip_output.c,v 1.18 1995/05/09 13:35:46 davidg Exp $
+ * ip_output.c,v 1.19 1995/05/30 08:09:49 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 73bd43da9dc6..454fc38b52e0 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_var.h,v 1.9 1995/03/16 18:15:01 bde Exp $
+ * ip_var.h,v 1.10 1995/05/30 08:09:50 rgrimes Exp
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 89697a0906d6..a073f640080a 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.2 (Berkeley) 1/4/94
- * $Id: raw_ip.c,v 1.18 1995/05/12 20:00:21 ache Exp $
+ * raw_ip.c,v 1.19 1995/05/30 08:09:52 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index a79acf96625b..a15b9c2d5fe5 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp.h,v 1.5 1995/02/14 02:35:14 wollman Exp $
+ * tcp.h,v 1.6 1995/05/30 08:09:53 rgrimes Exp
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index cef966cc7328..46baf0242bd0 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_debug.c,v 1.3 1995/02/09 23:13:22 wollman Exp $
+ * tcp_debug.c,v 1.4 1995/04/19 10:26:04 olah Exp
  */
 
 #ifdef TCPDEBUG
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 159b79810809..b7a03b2ec2fe 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_debug.h,v 1.2 1994/08/02 07:48:56 davidg Exp $
+ * tcp_debug.h,v 1.3 1994/08/21 05:27:35 paul Exp
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 28f04f082f1e..040a12a05961 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_fsm.h,v 1.5 1995/02/16 01:53:31 wollman Exp $
+ * tcp_fsm.h,v 1.6 1995/03/30 23:35:55 davidg Exp
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index bf0fd0c5447a..18471a8499f7 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.24 1995/05/11 01:41:06 davidg Exp $
+ *	tcp_input.c,v 1.25 1995/05/30 08:09:55 rgrimes Exp
  */
 
 #ifndef TUBA_INCLUDE
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 33a6b83717b4..ecead23ace3f 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.3 (Berkeley) 12/30/93
- * $Id: tcp_output.c,v 1.10 1995/05/09 13:35:47 davidg Exp $
+ * tcp_output.c,v 1.11 1995/05/30 08:09:56 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 6f0532f3449b..1c5753f48fc4 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_seq.h,v 1.4 1995/02/08 20:18:46 wollman Exp $
+ * tcp_seq.h,v 1.5 1995/02/14 02:35:17 wollman Exp
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 381824de0eb5..069efa870922 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_subr.c,v 1.10 1995/04/09 01:29:26 davidg Exp $
+ * tcp_subr.c,v 1.11 1995/05/30 08:09:58 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index ddab8d6d4b28..a898db13c13a 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_timer.c,v 1.6 1995/04/12 06:49:56 davidg Exp $
+ * tcp_timer.c,v 1.7 1995/05/30 08:09:59 rgrimes Exp
  */
 
 #ifndef TUBA_INCLUDE
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index b9af05f81061..dc4219b1c7e1 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_timer.h,v 1.5 1995/02/08 20:18:47 wollman Exp $
+ * tcp_timer.h,v 1.6 1995/02/14 02:35:18 wollman Exp
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 7f50980aa5cf..07172cb21be2 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.14 1995/05/30 08:10:00 rgrimes Exp $
+ *	tcp_usrreq.c,v 1.14.2.1 1995/06/09 03:21:13 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 56d9f3e949d7..cf92f47a205d 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.3 (Berkeley) 4/10/94
- * $Id: tcp_var.h,v 1.10 1995/03/16 18:15:07 bde Exp $
+ * tcp_var.h,v 1.11 1995/04/09 01:29:29 davidg Exp
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index bc71fbc654d3..b6e4ec1929d8 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id: tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp $
+ * tcpip.h,v 1.4 1995/02/08 20:18:48 wollman Exp
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index d47ea918a458..ba603a7503b7 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id: udp.h,v 1.2 1994/08/02 07:49:22 davidg Exp $
+ * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 7e13103b4bcc..2f40ba839e41 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.4 (Berkeley) 1/21/94
- * $Id: udp_usrreq.c,v 1.11 1995/05/09 13:35:48 davidg Exp $
+ * udp_usrreq.c,v 1.12 1995/05/30 08:10:02 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 6e98e9c4a7ac..ac19646310d4 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: udp_var.h,v 1.4 1995/02/16 00:27:47 wollman Exp $
+ * udp_var.h,v 1.5 1995/04/09 01:29:31 davidg Exp
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h
index e87da1cd89f8..da629364ab4e 100644
--- a/sys/netiso/argo_debug.h
+++ b/sys/netiso/argo_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)argo_debug.h	8.1 (Berkeley) 6/10/93
- * $Id: argo_debug.h,v 1.3 1994/08/21 06:14:11 paul Exp $
+ * argo_debug.h,v 1.4 1995/05/30 08:10:09 rgrimes Exp
  */
 
 #ifndef _NETISO_ARGO_DEBUG_H_
@@ -64,8 +64,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/argo_debug.h,v 1.3 1994/08/21 06:14:11 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/argo_debug.h,v $
+ * /home/ncvs/src/sys/netiso/argo_debug.h,v 1.4 1995/05/30 08:10:09 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/argo_debug.h,v
  */
 
 
diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h
index 65c536ae075f..3386ce670acf 100644
--- a/sys/netiso/clnl.h
+++ b/sys/netiso/clnl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnl.h	8.1 (Berkeley) 6/10/93
- * $Id: clnl.h,v 1.3 1994/08/21 06:14:12 paul Exp $
+ * clnl.h,v 1.4 1995/05/30 08:10:11 rgrimes Exp
  */
 
 #ifndef _NETISO_CLNL_H_
diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h
index 646b6b8fc6f2..f07b16818c0b 100644
--- a/sys/netiso/clnp.h
+++ b/sys/netiso/clnp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp.h	8.2 (Berkeley) 4/16/94
- * $Id: clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp $
+ * clnp.h,v 1.4 1995/05/30 08:10:12 rgrimes Exp
  */
 
 #ifndef _NETISO_CLNP_H_
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp.h,v $ */
+/* /home/ncvs/src/sys/netiso/clnp.h,v 1.4 1995/05/30 08:10:12 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp.h,v */
 
 /* should be config option but cpp breaks with too many #defines */
 #define	DECBIT
diff --git a/sys/netiso/clnp_debug.c b/sys/netiso/clnp_debug.c
index 52d6f040dfa6..cc33fe510529 100644
--- a/sys/netiso/clnp_debug.c
+++ b/sys/netiso/clnp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_debug.c,v 1.2 1994/08/02 07:49:35 davidg Exp $
+ * clnp_debug.c,v 1.3 1995/05/30 08:10:14 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.2 1994/08/02 07:49:35 davidg Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_debug.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.3 1995/05/30 08:10:14 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_debug.c,v */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_er.c b/sys/netiso/clnp_er.c
index ca12308dde17..d24967d386e7 100644
--- a/sys/netiso/clnp_er.c
+++ b/sys/netiso/clnp_er.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_er.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_er.c,v 1.3 1994/11/15 14:26:10 bde Exp $
+ * clnp_er.c,v 1.4 1995/05/30 08:10:15 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_er.c,v 1.3 1994/11/15 14:26:10 bde Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_er.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_er.c,v 1.4 1995/05/30 08:10:15 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_er.c,v */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c
index 69c92a5b8c1a..911dcaf1593f 100644
--- a/sys/netiso/clnp_frag.c
+++ b/sys/netiso/clnp_frag.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_frag.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_frag.c,v 1.2 1994/08/02 07:49:37 davidg Exp $
+ * clnp_frag.c,v 1.3 1995/05/30 08:10:17 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.2 1994/08/02 07:49:37 davidg Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_frag.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.3 1995/05/30 08:10:17 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_frag.c,v */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c
index c67df925bb3f..382727e3336c 100644
--- a/sys/netiso/clnp_input.c
+++ b/sys/netiso/clnp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_input.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_input.c,v 1.5 1995/05/11 00:13:20 wollman Exp $
+ * clnp_input.c,v 1.6 1995/05/30 08:10:19 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_input.c,v 1.5 1995/05/11 00:13:20 wollman Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_input.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_input.c,v 1.6 1995/05/30 08:10:19 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_input.c,v */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/clnp_options.c b/sys/netiso/clnp_options.c
index bac8b5b8da67..fe4aeb774b7c 100644
--- a/sys/netiso/clnp_options.c
+++ b/sys/netiso/clnp_options.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_options.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_options.c,v 1.2 1994/08/02 07:49:40 davidg Exp $
+ * clnp_options.c,v 1.3 1995/05/30 08:10:20 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_options.c,v 1.2 1994/08/02 07:49:40 davidg Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_options.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_options.c,v 1.3 1995/05/30 08:10:20 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_options.c,v */
 
 #ifdef ISO
 
diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c
index 579d923724c0..312d9113ebd5 100644
--- a/sys/netiso/clnp_output.c
+++ b/sys/netiso/clnp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_output.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_output.c,v 1.3 1994/11/15 14:26:12 bde Exp $
+ * clnp_output.c,v 1.4 1995/05/30 08:10:22 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_output.c,v 1.3 1994/11/15 14:26:12 bde Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_output.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_output.c,v 1.4 1995/05/30 08:10:22 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_output.c,v */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c
index ade1ba24cf7e..120a06e43a08 100644
--- a/sys/netiso/clnp_raw.c
+++ b/sys/netiso/clnp_raw.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_raw.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_raw.c,v 1.2 1994/08/02 07:49:44 davidg Exp $
+ * clnp_raw.c,v 1.3 1995/05/30 08:10:23 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.2 1994/08/02 07:49:44 davidg Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_raw.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.3 1995/05/30 08:10:23 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_raw.c,v */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h
index a6cdd0478f11..dcff8a66355d 100644
--- a/sys/netiso/clnp_stat.h
+++ b/sys/netiso/clnp_stat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_stat.h	8.1 (Berkeley) 6/10/93
- * $Id: clnp_stat.h,v 1.3 1994/08/21 06:14:13 paul Exp $
+ * clnp_stat.h,v 1.4 1995/05/30 08:10:24 rgrimes Exp
  */
 
 #ifndef _NETISO_CLNP_STAT_H_
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.3 1994/08/21 06:14:13 paul Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_stat.h,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.4 1995/05/30 08:10:24 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_stat.h,v */
 
 struct clnp_stat {
 	int cns_total;			/* total pkts received */
diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c
index 138871ef625d..ae3cef930c91 100644
--- a/sys/netiso/clnp_subr.c
+++ b/sys/netiso/clnp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_subr.c,v 1.2 1994/08/02 07:49:50 davidg Exp $
+ * clnp_subr.c,v 1.3 1995/05/30 08:10:26 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.2 1994/08/02 07:49:50 davidg Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_subr.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.3 1995/05/30 08:10:26 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_subr.c,v */
 
 #ifdef ISO
 
diff --git a/sys/netiso/clnp_timer.c b/sys/netiso/clnp_timer.c
index 401d35866cf8..ee4d84cef50f 100644
--- a/sys/netiso/clnp_timer.c
+++ b/sys/netiso/clnp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_timer.c,v 1.3 1994/11/15 14:26:13 bde Exp $
+ * clnp_timer.c,v 1.4 1995/05/30 08:10:27 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.3 1994/11/15 14:26:13 bde Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/clnp_timer.c,v $ */
+/* /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.4 1995/05/30 08:10:27 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/clnp_timer.c,v */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c
index 7b95f93bf087..98894604fbe9 100644
--- a/sys/netiso/cltp_usrreq.c
+++ b/sys/netiso/cltp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cltp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: cltp_usrreq.c,v 1.3 1994/11/15 14:26:14 bde Exp $
+ * cltp_usrreq.c,v 1.4 1995/05/30 08:10:29 rgrimes Exp
  */
 
 #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */
diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h
index 122a272b3dd7..ac5879a7efae 100644
--- a/sys/netiso/cltp_var.h
+++ b/sys/netiso/cltp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cltp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: cltp_var.h,v 1.2 1994/08/02 07:49:58 davidg Exp $
+ * cltp_var.h,v 1.3 1994/08/21 06:14:14 paul Exp
  */
 
 #ifndef _NETISO_CLTP_VAR_H_
diff --git a/sys/netiso/cons.h b/sys/netiso/cons.h
index ecaa3741b5d9..2d2645b5f05d 100644
--- a/sys/netiso/cons.h
+++ b/sys/netiso/cons.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cons.h	8.1 (Berkeley) 6/10/93
- * $Id: cons.h,v 1.3 1994/08/21 06:14:15 paul Exp $
+ * cons.h,v 1.4 1995/05/30 08:10:30 rgrimes Exp
  */
 
 #ifndef _NETISO_CONS_H_
@@ -64,8 +64,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/cons.h,v 1.3 1994/08/21 06:14:15 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/cons.h,v $
+ * /home/ncvs/src/sys/netiso/cons.h,v 1.4 1995/05/30 08:10:30 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/cons.h,v
  *
  * interface between TP and CONS
  */
diff --git a/sys/netiso/cons_pcb.h b/sys/netiso/cons_pcb.h
index 7a3b52f416d9..7a57e51c534f 100644
--- a/sys/netiso/cons_pcb.h
+++ b/sys/netiso/cons_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cons_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: cons_pcb.h,v 1.3 1994/08/21 06:14:16 paul Exp $
+ * cons_pcb.h,v 1.4 1995/05/30 08:10:31 rgrimes Exp
  */
 
 #ifndef _NETISO_CONS_PCB_H_
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.3 1994/08/21 06:14:16 paul Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/cons_pcb.h,v $ */
+/* /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.4 1995/05/30 08:10:31 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/cons_pcb.h,v */
 
 /*
  * protocol control block for the connection oriented network service
diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h
index 8b005329b34f..febfa0a80156 100644
--- a/sys/netiso/eonvar.h
+++ b/sys/netiso/eonvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eonvar.h	8.1 (Berkeley) 6/10/93
- * $Id: eonvar.h,v 1.3 1994/08/21 06:14:17 paul Exp $
+ * eonvar.h,v 1.4 1995/05/30 08:10:33 rgrimes Exp
  */
 
 #ifndef _NETISO_EONVAR_H_
diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c
index f62de5d41012..f65d87c11915 100644
--- a/sys/netiso/esis.c
+++ b/sys/netiso/esis.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)esis.c	8.1 (Berkeley) 6/10/93
- * $Id: esis.c,v 1.3 1994/12/13 22:33:03 wollman Exp $
+ * esis.c,v 1.4 1995/05/30 08:10:34 rgrimes Exp
  */
 
 /***********************************************************
diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h
index 400d120387d6..3c9d57a06874 100644
--- a/sys/netiso/esis.h
+++ b/sys/netiso/esis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)esis.h	8.1 (Berkeley) 6/10/93
- * $Id: esis.h,v 1.3 1994/08/21 06:14:18 paul Exp $
+ * esis.h,v 1.4 1995/05/30 08:10:36 rgrimes Exp
  */
 
 #ifndef _NETISO_ESIS_H_
@@ -64,8 +64,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- *	$Header: /home/ncvs/src/sys/netiso/esis.h,v 1.3 1994/08/21 06:14:18 paul Exp $
- *	$Source: /home/ncvs/src/sys/netiso/esis.h,v $
+ *	/home/ncvs/src/sys/netiso/esis.h,v 1.4 1995/05/30 08:10:36 rgrimes Exp
+ *	/home/ncvs/src/sys/netiso/esis.h,v
  */
 
 #ifndef BYTE_ORDER
diff --git a/sys/netiso/idrp_usrreq.c b/sys/netiso/idrp_usrreq.c
index 8e3a3d213844..1327b307a1ee 100644
--- a/sys/netiso/idrp_usrreq.c
+++ b/sys/netiso/idrp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idrp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: idrp_usrreq.c,v 1.2 1994/08/02 07:50:16 davidg Exp $
+ * idrp_usrreq.c,v 1.3 1995/05/30 08:10:38 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c
index 28559b7bd1e5..9bfda52480a4 100644
--- a/sys/netiso/if_cons.c
+++ b/sys/netiso/if_cons.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_cons.c	8.1 (Berkeley) 6/10/93
- * $Id: if_cons.c,v 1.3 1994/12/13 22:33:04 wollman Exp $
+ * if_cons.c,v 1.4 1995/05/30 08:10:39 rgrimes Exp
  */
 
 /***********************************************************
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/if_cons.c,v 1.3 1994/12/13 22:33:04 wollman Exp $
- * $Source: /home/ncvs/src/sys/netiso/if_cons.c,v $
+ * /home/ncvs/src/sys/netiso/if_cons.c,v 1.4 1995/05/30 08:10:39 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/if_cons.c,v
  *
  * cons.c - Connection Oriented Network Service:
  * including support for a) user transport-level service,
diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c
index c8ac5997be30..82c3323d0469 100644
--- a/sys/netiso/if_eon.c
+++ b/sys/netiso/if_eon.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_eon.c	8.1 (Berkeley) 6/10/93
- * $Id: if_eon.c,v 1.3 1995/04/26 18:10:57 pst Exp $
+ * if_eon.c,v 1.4 1995/05/30 08:10:45 rgrimes Exp
  */
 
 /***********************************************************
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/if_eon.c,v 1.3 1995/04/26 18:10:57 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/if_eon.c,v $
+ * /home/ncvs/src/sys/netiso/if_eon.c,v 1.4 1995/05/30 08:10:45 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/if_eon.c,v
  *
  *	EON rfc
  *  Layer between IP and CLNL
diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c
index 447fb2127988..8c8e2afac229 100644
--- a/sys/netiso/iso.c
+++ b/sys/netiso/iso.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.c	8.2 (Berkeley) 11/15/93
- * $Id: iso.c,v 1.3 1995/04/26 18:10:58 pst Exp $
+ * iso.c,v 1.4 1995/05/30 08:10:46 rgrimes Exp
  */
 
 /***********************************************************
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/iso.c,v 1.3 1995/04/26 18:10:58 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/iso.c,v $
+ * /home/ncvs/src/sys/netiso/iso.c,v 1.4 1995/05/30 08:10:46 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/iso.c,v
  *
  * iso.c: miscellaneous routines to support the iso address family
  */
diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h
index 1ac1f1353b36..e24b522d1a20 100644
--- a/sys/netiso/iso.h
+++ b/sys/netiso/iso.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.1 (Berkeley) 6/10/93
- * $Id: iso.h,v 1.3 1994/08/21 06:14:19 paul Exp $
+ * iso.h,v 1.4 1995/05/30 08:10:49 rgrimes Exp
  */
 
 #ifndef _NETISO_ISO_H_
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.3 1994/08/21 06:14:19 paul Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/iso.h,v $ */
+/* /home/ncvs/src/sys/netiso/iso.h,v 1.4 1995/05/30 08:10:49 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/iso.h,v */
 
 /*
  *	Return true if this is a multicast address
diff --git a/sys/netiso/iso_chksum.c b/sys/netiso/iso_chksum.c
index 19a3b65af687..dc3fd5f410d1 100644
--- a/sys/netiso/iso_chksum.c
+++ b/sys/netiso/iso_chksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_chksum.c	8.1 (Berkeley) 6/10/93
- * $Id: iso_chksum.c,v 1.2 1994/08/02 07:50:31 davidg Exp $
+ * iso_chksum.c,v 1.3 1995/05/30 08:10:50 rgrimes Exp
  */
 
 /***********************************************************
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.2 1994/08/02 07:50:31 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/iso_chksum.c,v $
+ * /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.3 1995/05/30 08:10:50 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/iso_chksum.c,v
  *
  * ISO CHECKSUM
  *
diff --git a/sys/netiso/iso_errno.h b/sys/netiso/iso_errno.h
index 7f03492afec2..94cf111bbcdd 100644
--- a/sys/netiso/iso_errno.h
+++ b/sys/netiso/iso_errno.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_errno.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_errno.h,v 1.4 1994/11/27 20:58:30 ats Exp $
+ * iso_errno.h,v 1.5 1995/05/30 08:10:52 rgrimes Exp
  */
 
 #ifndef _NETISO_ISO_ERRNO_H_
diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c
index 613f2c4e0d0b..a2c7bee509cb 100644
--- a/sys/netiso/iso_pcb.c
+++ b/sys/netiso/iso_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id: iso_pcb.c,v 1.2 1994/08/02 07:50:37 davidg Exp $
+ * iso_pcb.c,v 1.3 1995/05/30 08:10:53 rgrimes Exp
  */
 
 /***********************************************************
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.2 1994/08/02 07:50:37 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/iso_pcb.c,v $
+ * /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.3 1995/05/30 08:10:53 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/iso_pcb.c,v
  *
  * Iso address family net-layer(s) pcb stuff. NEH 1/29/87
  */
diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h
index 80fc29a193a0..03c524d3f2b1 100644
--- a/sys/netiso/iso_pcb.h
+++ b/sys/netiso/iso_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_pcb.h,v 1.3 1994/08/21 06:14:20 paul Exp $
+ * iso_pcb.h,v 1.4 1995/05/30 08:10:55 rgrimes Exp
  */
 
 #ifndef _NETISO_ISO_PCB_H_
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.3 1994/08/21 06:14:20 paul Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/iso_pcb.h,v $ */
+/* /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.4 1995/05/30 08:10:55 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/iso_pcb.h,v */
 
 #define	MAXX25CRUDLEN	16	/* 16 bytes of call request user data */
 
diff --git a/sys/netiso/iso_proto.c b/sys/netiso/iso_proto.c
index 86d6cf26089f..7b9af11d5178 100644
--- a/sys/netiso/iso_proto.c
+++ b/sys/netiso/iso_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: iso_proto.c,v 1.3 1995/05/11 00:13:20 wollman Exp $
+ * iso_proto.c,v 1.4 1995/05/30 08:10:56 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_proto.c,v 1.3 1995/05/11 00:13:20 wollman Exp $
- * $Source: /home/ncvs/src/sys/netiso/iso_proto.c,v $
+/* /home/ncvs/src/sys/netiso/iso_proto.c,v 1.4 1995/05/30 08:10:56 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/iso_proto.c,v
  *
  * iso_proto.c : protocol switch tables in the ISO domain
  *
diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c
index 3650231162d3..fab271b0af6f 100644
--- a/sys/netiso/iso_snpac.c
+++ b/sys/netiso/iso_snpac.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_snpac.c	8.1 (Berkeley) 6/10/93
- * $Id: iso_snpac.c,v 1.3 1994/12/13 22:33:05 wollman Exp $
+ * iso_snpac.c,v 1.4 1995/05/30 08:10:58 rgrimes Exp
  */
 
 /***********************************************************
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.3 1994/12/13 22:33:05 wollman Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/iso_snpac.c,v $ */
+/* /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.4 1995/05/30 08:10:58 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/iso_snpac.c,v */
 
 #ifdef ISO
 
diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h
index e817b818b5a0..8f2d54434f57 100644
--- a/sys/netiso/iso_snpac.h
+++ b/sys/netiso/iso_snpac.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_snpac.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_snpac.h,v 1.4 1995/03/28 07:57:14 bde Exp $
+ * iso_snpac.h,v 1.5 1995/05/30 08:10:59 rgrimes Exp
  */
 
 #ifndef _NETISO_ISO_SNPAC_H_
diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h
index b87499509ce5..3b1f212aa333 100644
--- a/sys/netiso/iso_var.h
+++ b/sys/netiso/iso_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_var.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_var.h,v 1.4 1995/03/16 18:15:21 bde Exp $
+ * iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp
  */
 
 #ifndef _NETISO_ISO_VAR_H_
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.4 1995/03/16 18:15:21 bde Exp $
- * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $
+/* /home/ncvs/src/sys/netiso/iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/iso_var.h,v
  */
 
 /*
diff --git a/sys/netiso/tp.trans b/sys/netiso/tp.trans
index edefc769b816..b985d8bfa9e6 100644
--- a/sys/netiso/tp.trans
+++ b/sys/netiso/tp.trans
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: tp.trans,v 5.1 88/10/12 12:22:07 root Exp $
+/* /home/ncvs/src/sys/netiso/tp.trans,v 1.1.1.1 1994/05/24 10:07:31 rgrimes Exp
  *
  * Transition file for TP.
  *
diff --git a/sys/netiso/tp_astring.c b/sys/netiso/tp_astring.c
index 5bfa71115102..d285e5b149ef 100644
--- a/sys/netiso/tp_astring.c
+++ b/sys/netiso/tp_astring.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_astring.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * tp_astring.c,v 1.2 1994/08/02 07:50:51 davidg Exp
  */
 
 char *tp_sstring[] = {
diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h
index 7e54a6739731..cd5d3f2a5c7d 100644
--- a/sys/netiso/tp_clnp.h
+++ b/sys/netiso/tp_clnp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_clnp.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_clnp.h,v 1.3 1994/08/21 06:14:23 paul Exp $
+ * tp_clnp.h,v 1.4 1995/05/30 08:11:02 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_CLNP_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.3 1994/08/21 06:14:23 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_clnp.h,v $
+ * /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.4 1995/05/30 08:11:02 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_clnp.h,v
  *
  * AF_ISO net-dependent structures and include files
  *
diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c
index ca2dc328a3c3..a961efc6258d 100644
--- a/sys/netiso/tp_cons.c
+++ b/sys/netiso/tp_cons.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_cons.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_cons.c,v 1.3 1994/11/15 14:26:15 bde Exp $
+ * tp_cons.c,v 1.4 1995/05/30 08:11:04 rgrimes Exp
  */
 
 /***********************************************************
@@ -62,8 +62,8 @@ SOFTWARE.
  */
 /*
  * ARGO TP
- * $Header: /home/ncvs/src/sys/netiso/tp_cons.c,v 1.3 1994/11/15 14:26:15 bde Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_cons.c,v $
+ * /home/ncvs/src/sys/netiso/tp_cons.c,v 1.4 1995/05/30 08:11:04 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_cons.c,v
  *
  * Here is where you find the iso- and cons-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c
index 5c42447896a2..fec680f2a70d 100644
--- a/sys/netiso/tp_driver.c
+++ b/sys/netiso/tp_driver.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tp_driver.c,v 1.2 1994/08/02 07:50:59 davidg Exp $
+ * tp_driver.c,v 1.3 1995/05/30 08:11:05 rgrimes Exp
  */
 #define _XEBEC_PG static
 
diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c
index d26cea088097..fd8ed77c463b 100644
--- a/sys/netiso/tp_emit.c
+++ b/sys/netiso/tp_emit.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_emit.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_emit.c,v 1.2 1994/08/02 07:51:02 davidg Exp $
+ * tp_emit.c,v 1.3 1995/05/30 08:11:07 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_emit.c,v 1.2 1994/08/02 07:51:02 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_emit.c,v $
+ * /home/ncvs/src/sys/netiso/tp_emit.c,v 1.3 1995/05/30 08:11:07 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_emit.c,v
  *
  * This file contains tp_emit() and tp_error_emit(), which
  * form TPDUs and hand them to ip.
diff --git a/sys/netiso/tp_events.h b/sys/netiso/tp_events.h
index c425ceedb03f..62f10f04a8c5 100644
--- a/sys/netiso/tp_events.h
+++ b/sys/netiso/tp_events.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tp_events.h,v 1.3 1994/08/21 06:14:24 paul Exp $
+ * tp_events.h,v 1.4 1995/05/30 08:11:09 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_EVENTS_H_
diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c
index d8a9a4284aaa..d54f6f9de463 100644
--- a/sys/netiso/tp_inet.c
+++ b/sys/netiso/tp_inet.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_inet.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_inet.c,v 1.4 1995/04/26 21:32:36 pst Exp $
+ * tp_inet.c,v 1.5 1995/05/30 08:11:10 rgrimes Exp
  */
 
 /***********************************************************
@@ -62,8 +62,8 @@ SOFTWARE.
  */
 /*
  * ARGO TP
- * $Header: /home/ncvs/src/sys/netiso/tp_inet.c,v 1.4 1995/04/26 21:32:36 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_inet.c,v $
+ * /home/ncvs/src/sys/netiso/tp_inet.c,v 1.5 1995/05/30 08:11:10 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_inet.c,v
  *
  * Here is where you find the inet-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c
index 2caa2bf036e3..9bc9946a8e24 100644
--- a/sys/netiso/tp_input.c
+++ b/sys/netiso/tp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_input.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_input.c,v 1.2 1994/08/02 07:51:11 davidg Exp $
+ * tp_input.c,v 1.3 1995/05/30 08:11:12 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_input.c,v 1.2 1994/08/02 07:51:11 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_input.c,v $
+ * /home/ncvs/src/sys/netiso/tp_input.c,v 1.3 1995/05/30 08:11:12 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_input.c,v
  *
  * tp_input() gets an mbuf chain from ip.  Actually, not directly
  * from ip, because ip calls a net-level routine that strips off
diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h
index 865e2fde69de..d7f78a203849 100644
--- a/sys/netiso/tp_ip.h
+++ b/sys/netiso/tp_ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_ip.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_ip.h,v 1.3 1994/08/21 06:14:24 paul Exp $
+ * tp_ip.h,v 1.4 1995/05/30 08:11:13 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_IP_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_ip.h,v 1.3 1994/08/21 06:14:24 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_ip.h,v $
+ * /home/ncvs/src/sys/netiso/tp_ip.h,v 1.4 1995/05/30 08:11:13 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_ip.h,v
  *
  * internet IP-dependent structures and include files
  *
diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c
index b62debedf2f0..f749161626ac 100644
--- a/sys/netiso/tp_iso.c
+++ b/sys/netiso/tp_iso.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_iso.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_iso.c,v 1.2 1994/08/02 07:51:14 davidg Exp $
+ * tp_iso.c,v 1.3 1995/05/30 08:11:18 rgrimes Exp
  */
 
 /***********************************************************
@@ -62,8 +62,8 @@ SOFTWARE.
  */
 /*
  * ARGO TP
- * $Header: /home/ncvs/src/sys/netiso/tp_iso.c,v 1.2 1994/08/02 07:51:14 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_iso.c,v $
+ * /home/ncvs/src/sys/netiso/tp_iso.c,v 1.3 1995/05/30 08:11:18 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_iso.c,v
  *
  * Here is where you find the iso-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
diff --git a/sys/netiso/tp_meas.c b/sys/netiso/tp_meas.c
index f7bbecb7d017..b06aaa1ba860 100644
--- a/sys/netiso/tp_meas.c
+++ b/sys/netiso/tp_meas.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_meas.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_meas.c,v 1.2 1994/08/02 07:51:15 davidg Exp $
+ * tp_meas.c,v 1.3 1995/05/30 08:11:20 rgrimes Exp
  */
 
 /***********************************************************
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/tp_meas.c,v 1.2 1994/08/02 07:51:15 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_meas.c,v $
+ * /home/ncvs/src/sys/netiso/tp_meas.c,v 1.3 1995/05/30 08:11:20 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_meas.c,v
  *
  * tp_meas.c : create a performance measurement event
  * in the circular buffer tp_Meas[]
diff --git a/sys/netiso/tp_meas.h b/sys/netiso/tp_meas.h
index ec38744d04b7..d6ec0206e45c 100644
--- a/sys/netiso/tp_meas.h
+++ b/sys/netiso/tp_meas.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_meas.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_meas.h,v 1.3 1994/08/21 06:14:25 paul Exp $
+ * tp_meas.h,v 1.4 1995/05/30 08:11:21 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_MEAS_H_
diff --git a/sys/netiso/tp_output.c b/sys/netiso/tp_output.c
index bfa938b13012..18f08819550b 100644
--- a/sys/netiso/tp_output.c
+++ b/sys/netiso/tp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_output.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_output.c,v 1.3 1995/04/26 21:32:37 pst Exp $
+ * tp_output.c,v 1.4 1995/05/30 08:11:23 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_output.c,v 1.3 1995/04/26 21:32:37 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_output.c,v $
+ * /home/ncvs/src/sys/netiso/tp_output.c,v 1.4 1995/05/30 08:11:23 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_output.c,v
  *
  * In here is tp_ctloutput(), the guy called by [sg]etsockopt(),
  */
diff --git a/sys/netiso/tp_param.h b/sys/netiso/tp_param.h
index 6b0195314b9c..0b09730e853e 100644
--- a/sys/netiso/tp_param.h
+++ b/sys/netiso/tp_param.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_param.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_param.h,v 1.3 1994/08/21 06:14:26 paul Exp $
+ * tp_param.h,v 1.4 1995/05/30 08:11:24 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_PARAM_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_param.h,v 1.3 1994/08/21 06:14:26 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_param.h,v $
+ * /home/ncvs/src/sys/netiso/tp_param.h,v 1.4 1995/05/30 08:11:24 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_param.h,v
  *
  */
 
diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c
index da34f3fa2402..233d204644eb 100644
--- a/sys/netiso/tp_pcb.c
+++ b/sys/netiso/tp_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_pcb.c,v 1.4 1995/04/26 21:32:38 pst Exp $
+ * tp_pcb.c,v 1.5 1995/05/30 08:11:26 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.4 1995/04/26 21:32:38 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_pcb.c,v $
+ * /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.5 1995/05/30 08:11:26 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_pcb.c,v
  *
  *
  * This is the initialization and cleanup stuff -
diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h
index 6322835dd379..834b309f82e5 100644
--- a/sys/netiso/tp_pcb.h
+++ b/sys/netiso/tp_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_pcb.h,v 1.4 1995/04/26 21:32:39 pst Exp $
+ * tp_pcb.h,v 1.5 1995/05/30 08:11:27 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_PCB_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.4 1995/04/26 21:32:39 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_pcb.h,v $
+ * /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.5 1995/05/30 08:11:27 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_pcb.h,v
  *
  *
  * This file defines the transport protocol control block (tpcb).
diff --git a/sys/netiso/tp_seq.h b/sys/netiso/tp_seq.h
index 7b8fcd3394ae..d040b5bf42af 100644
--- a/sys/netiso/tp_seq.h
+++ b/sys/netiso/tp_seq.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_seq.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_seq.h,v 1.3 1994/08/21 06:14:28 paul Exp $
+ * tp_seq.h,v 1.4 1995/05/30 08:11:29 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_SEQ_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_seq.h,v 1.3 1994/08/21 06:14:28 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_seq.h,v $
+ * /home/ncvs/src/sys/netiso/tp_seq.h,v 1.4 1995/05/30 08:11:29 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_seq.h,v
  *
  * These macros perform sequence number arithmetic modulo (2**7 or 2**31).
  * The relevant fields in the tpcb are:
diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h
index e7c80fd22baa..d513cb2165e5 100644
--- a/sys/netiso/tp_stat.h
+++ b/sys/netiso/tp_stat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_stat.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_stat.h,v 1.3 1994/08/21 06:14:28 paul Exp $
+ * tp_stat.h,v 1.4 1995/05/30 08:11:30 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_STAT_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_stat.h,v 1.3 1994/08/21 06:14:28 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_stat.h,v $
+ * /home/ncvs/src/sys/netiso/tp_stat.h,v 1.4 1995/05/30 08:11:30 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_stat.h,v
  *
  * Here are the data structures in which the global
  * statistics(counters) are gathered.
diff --git a/sys/netiso/tp_states.h b/sys/netiso/tp_states.h
index aff73fe78d27..3c1ff265d33d 100644
--- a/sys/netiso/tp_states.h
+++ b/sys/netiso/tp_states.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tp_states.h,v 1.3 1994/08/05 12:33:30 davidg Exp $
+ * tp_states.h,v 1.4 1994/08/21 06:14:29 paul Exp
  */
 
 #ifndef _NETISO_TP_STATES_H_
diff --git a/sys/netiso/tp_states.init b/sys/netiso/tp_states.init
index 89e53453866a..1009fbe93924 100644
--- a/sys/netiso/tp_states.init
+++ b/sys/netiso/tp_states.init
@@ -1,5 +1,5 @@
-/* $Header$ */
-/* $Source$ */
+/* /home/ncvs/src/sys/netiso/tp_states.init,v 1.1.1.1 1994/05/24 10:07:29 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/tp_states.init,v */
 {0x3,0x0},
 {0x6,0x1},
 {0x6,0x2},
diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c
index 6125a0a60747..a666ecd71810 100644
--- a/sys/netiso/tp_subr.c
+++ b/sys/netiso/tp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_subr.c,v 1.3 1995/04/26 21:32:40 pst Exp $
+ * tp_subr.c,v 1.4 1995/05/30 08:11:32 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_subr.c,v 1.3 1995/04/26 21:32:40 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_subr.c,v $
+ * /home/ncvs/src/sys/netiso/tp_subr.c,v 1.4 1995/05/30 08:11:32 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_subr.c,v
  *
  * The main work of data transfer is done here.
  * These routines are called from tp.trans.
diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c
index 943d11bcff73..7a504a63bd41 100644
--- a/sys/netiso/tp_subr2.c
+++ b/sys/netiso/tp_subr2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_subr2.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_subr2.c,v 1.3 1995/04/26 21:32:41 pst Exp $
+ * tp_subr2.c,v 1.4 1995/05/30 08:11:34 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.3 1995/04/26 21:32:41 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_subr2.c,v $
+ * /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.4 1995/05/30 08:11:34 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_subr2.c,v
  *
  * Some auxiliary routines:
  * 	tp_protocol_error: required by xebec- called when a combo of state,
diff --git a/sys/netiso/tp_timer.c b/sys/netiso/tp_timer.c
index 6ccc615ff8a3..60fbc36d45fb 100644
--- a/sys/netiso/tp_timer.c
+++ b/sys/netiso/tp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_timer.c,v 1.2 1994/08/02 07:51:27 davidg Exp $
+ * tp_timer.c,v 1.3 1995/05/30 08:11:35 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_timer.c,v 1.2 1994/08/02 07:51:27 davidg Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_timer.c,v $
+ * /home/ncvs/src/sys/netiso/tp_timer.c,v 1.3 1995/05/30 08:11:35 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_timer.c,v
  *
  */
 
diff --git a/sys/netiso/tp_timer.h b/sys/netiso/tp_timer.h
index 0894480546bb..38956d10d5f5 100644
--- a/sys/netiso/tp_timer.h
+++ b/sys/netiso/tp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_timer.h,v 1.3 1994/08/21 06:14:30 paul Exp $
+ * tp_timer.h,v 1.4 1995/05/30 08:11:37 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_TIMER_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_timer.h,v 1.3 1994/08/21 06:14:30 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_timer.h,v $
+ * /home/ncvs/src/sys/netiso/tp_timer.h,v 1.4 1995/05/30 08:11:37 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_timer.h,v
  *
  * ARGO TP
  * The callout structures used by the tp timers.
diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h
index c9a36795323e..bbb2dbea212b 100644
--- a/sys/netiso/tp_tpdu.h
+++ b/sys/netiso/tp_tpdu.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_tpdu.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp $
+ * tp_tpdu.h,v 1.4 1995/05/30 08:11:38 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_TPDU_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_tpdu.h,v $
+ * /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.4 1995/05/30 08:11:38 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_tpdu.h,v
  *
  * This ghastly set of macros makes it possible to
  * refer to tpdu structures without going mad.
diff --git a/sys/netiso/tp_trace.c b/sys/netiso/tp_trace.c
index a6f64ef06b34..ea6e5379ab75 100644
--- a/sys/netiso/tp_trace.c
+++ b/sys/netiso/tp_trace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_trace.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_trace.c,v 1.3 1995/04/26 21:32:41 pst Exp $
+ * tp_trace.c,v 1.4 1995/05/30 08:11:40 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_trace.c,v 1.3 1995/04/26 21:32:41 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_trace.c,v $
+ * /home/ncvs/src/sys/netiso/tp_trace.c,v 1.4 1995/05/30 08:11:40 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_trace.c,v
  *
  * The whole protocol trace module.
  * We keep a circular buffer of trace structures, which are big
diff --git a/sys/netiso/tp_trace.h b/sys/netiso/tp_trace.h
index b2dd01cb9740..d471a7b659b4 100644
--- a/sys/netiso/tp_trace.h
+++ b/sys/netiso/tp_trace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_trace.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_trace.h,v 1.3 1994/08/21 06:14:32 paul Exp $
+ * tp_trace.h,v 1.4 1995/05/30 08:11:41 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_TRACE_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_trace.h,v 1.3 1994/08/21 06:14:32 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_trace.h,v $
+ * /home/ncvs/src/sys/netiso/tp_trace.h,v 1.4 1995/05/30 08:11:41 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_trace.h,v
  *
  *
  * Definitions needed for the protocol trace mechanism.
diff --git a/sys/netiso/tp_user.h b/sys/netiso/tp_user.h
index bc86c2e2bd0d..3467b9a795c6 100644
--- a/sys/netiso/tp_user.h
+++ b/sys/netiso/tp_user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_user.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_user.h,v 1.3 1994/08/21 06:14:32 paul Exp $
+ * tp_user.h,v 1.4 1995/05/30 08:11:43 rgrimes Exp
  */
 
 #ifndef _NETISO_TP_USER_H_
@@ -66,8 +66,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_user.h,v 1.3 1994/08/21 06:14:32 paul Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_user.h,v $
+ * /home/ncvs/src/sys/netiso/tp_user.h,v 1.4 1995/05/30 08:11:43 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_user.h,v
  *
  * These are the values a real-live user ;-) needs.
  */
diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c
index 13948e8f9541..80e6a3752d91 100644
--- a/sys/netiso/tp_usrreq.c
+++ b/sys/netiso/tp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_usrreq.c,v 1.3 1995/04/26 21:32:42 pst Exp $
+ * tp_usrreq.c,v 1.4 1995/05/30 08:11:44 rgrimes Exp
  */
 
 /***********************************************************
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.3 1995/04/26 21:32:42 pst Exp $
- * $Source: /home/ncvs/src/sys/netiso/tp_usrreq.c,v $
+ * /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.4 1995/05/30 08:11:44 rgrimes Exp
+ * /home/ncvs/src/sys/netiso/tp_usrreq.c,v
  *
  * tp_usrreq(), the fellow that gets called from most of the socket code.
  * Pretty straighforward.
diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c
index 80a1e674d445..d62637ddbac8 100644
--- a/sys/netiso/tuba_subr.c
+++ b/sys/netiso/tuba_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tuba_subr.c,v 1.2 1994/08/02 07:51:34 davidg Exp $
+ * tuba_subr.c,v 1.3 1995/05/30 08:11:46 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netiso/tuba_table.c b/sys/netiso/tuba_table.c
index 0b0a977bf5a0..985da061aea4 100644
--- a/sys/netiso/tuba_table.c
+++ b/sys/netiso/tuba_table.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_table.c	8.2 (Berkeley) 11/15/93
- * $Id$
+ * tuba_table.c,v 1.2 1994/08/02 07:51:35 davidg Exp
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/tuba_table.h b/sys/netiso/tuba_table.h
index 5d2b2fd7701f..e5bed536e972 100644
--- a/sys/netiso/tuba_table.h
+++ b/sys/netiso/tuba_table.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_table.h	8.1 (Berkeley) 6/10/93
- * $Id: tuba_table.h,v 1.2 1994/08/02 07:51:37 davidg Exp $
+ * tuba_table.h,v 1.3 1994/08/21 06:14:33 paul Exp
  */
 
 #ifndef _NETISO_TUBA_TABLE_H_
diff --git a/sys/netiso/tuba_usrreq.c b/sys/netiso/tuba_usrreq.c
index 2b4f716b14de..b25704339e4e 100644
--- a/sys/netiso/tuba_usrreq.c
+++ b/sys/netiso/tuba_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: tuba_usrreq.c,v 1.2 1994/08/02 07:51:38 davidg Exp $
+ * tuba_usrreq.c,v 1.3 1995/05/30 08:11:48 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netiso/xebec/debug.h b/sys/netiso/xebec/debug.h
index c5b3622ce13c..106c433f9c35 100644
--- a/sys/netiso/xebec/debug.h
+++ b/sys/netiso/xebec/debug.h
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/debug.h,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/debug.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/debug.h,v 1.2 1995/05/30 08:11:55 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/debug.h,v */
 
 #define OUT stdout
 
diff --git a/sys/netiso/xebec/llparse.c b/sys/netiso/xebec/llparse.c
index 68b511ea7861..5d89b8fbf7b7 100644
--- a/sys/netiso/xebec/llparse.c
+++ b/sys/netiso/xebec/llparse.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/llparse.c,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/llparse.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/llparse.c,v 1.2 1995/05/30 08:11:57 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/llparse.c,v */
 /*
  * ************************* NOTICE *******************************
  * This code is in the public domain.  It cannot be copyrighted.
diff --git a/sys/netiso/xebec/llparse.h b/sys/netiso/xebec/llparse.h
index 718c3608dbe0..9a8e73858fab 100644
--- a/sys/netiso/xebec/llparse.h
+++ b/sys/netiso/xebec/llparse.h
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/llparse.h,v 1.1.1.1 1994/05/24 10:07:50 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/llparse.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/llparse.h,v 1.2 1995/05/30 08:11:59 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/llparse.h,v */
 
 	/************************************************************
 		attributes stack garbage
diff --git a/sys/netiso/xebec/llscan.c b/sys/netiso/xebec/llscan.c
index 8f1f1a033c59..f60cbcec4f53 100644
--- a/sys/netiso/xebec/llscan.c
+++ b/sys/netiso/xebec/llscan.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/llscan.c,v 1.1.1.1 1994/05/24 10:07:50 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/llscan.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/llscan.c,v 1.2 1995/05/30 08:12:01 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/llscan.c,v */
 /*
  * ************************* NOTICE *******************************
  * This code is in the public domain.  It cannot be copyrighted.
diff --git a/sys/netiso/xebec/main.c b/sys/netiso/xebec/main.c
index b46a930f5cc3..f18fdcda0890 100644
--- a/sys/netiso/xebec/main.c
+++ b/sys/netiso/xebec/main.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/main.c,v 1.1.1.1 1994/05/24 10:07:49 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/main.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/main.c,v 1.2 1995/05/30 08:12:03 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/main.c,v */
 /*
  * TODO:
  * rewrite the command line stuff altogether - it's kludged beyond
diff --git a/sys/netiso/xebec/main.h b/sys/netiso/xebec/main.h
index 236058d68036..97de690a7966 100644
--- a/sys/netiso/xebec/main.h
+++ b/sys/netiso/xebec/main.h
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/main.h,v 1.1.1.1 1994/05/24 10:07:49 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/main.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/main.h,v 1.2 1995/05/30 08:12:05 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/main.h,v */
 
 #define TRUE 1
 #define FALSE 0
diff --git a/sys/netiso/xebec/malloc.c b/sys/netiso/xebec/malloc.c
index d09af2987cdb..c2ae040b4bff 100644
--- a/sys/netiso/xebec/malloc.c
+++ b/sys/netiso/xebec/malloc.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/malloc.c,v 1.1.1.1 1994/05/24 10:07:48 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/malloc.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/malloc.c,v 1.2 1995/05/30 08:12:07 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/malloc.c,v */
 /*
  * This code is such a kludge that I don't want to put my name on it.
  * It was a ridiculously fast hack and needs rewriting.
diff --git a/sys/netiso/xebec/malloc.h b/sys/netiso/xebec/malloc.h
index 53d865bf47b5..c74d0eba0521 100644
--- a/sys/netiso/xebec/malloc.h
+++ b/sys/netiso/xebec/malloc.h
@@ -1,4 +1,4 @@
-/* $Header: malloc.h,v 2.1 88/09/19 12:56:27 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/malloc.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/malloc.h,v 1.1.1.1 1994/05/24 10:07:47 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/malloc.h,v */
 
 char *Malloc();
diff --git a/sys/netiso/xebec/procs.c b/sys/netiso/xebec/procs.c
index 8134a82f65a8..0db73ff8d76b 100644
--- a/sys/netiso/xebec/procs.c
+++ b/sys/netiso/xebec/procs.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/procs.c,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/procs.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/procs.c,v 1.2 1995/05/30 08:12:08 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/procs.c,v */
 /*
  * This code is such a kludge that I don't want to put my name on it.
  * It was a ridiculously fast hack and needs rewriting.
diff --git a/sys/netiso/xebec/procs.h b/sys/netiso/xebec/procs.h
index e41ae75995ce..c9f0c647fc0a 100644
--- a/sys/netiso/xebec/procs.h
+++ b/sys/netiso/xebec/procs.h
@@ -1,5 +1,5 @@
-/* $Header: procs.h,v 2.1 88/09/19 12:56:30 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/procs.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/procs.h,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/procs.h,v */
 
 extern char *stash();
 extern struct Object *SameState;
diff --git a/sys/netiso/xebec/putdriver.c b/sys/netiso/xebec/putdriver.c
index 85fcd501fccf..04d59f288205 100644
--- a/sys/netiso/xebec/putdriver.c
+++ b/sys/netiso/xebec/putdriver.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/putdriver.c,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/putdriver.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/putdriver.c,v 1.2 1995/05/30 08:12:10 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/putdriver.c,v */
 
 /*
  * This code is such a kludge that I don't want to put my name on it.
diff --git a/sys/netiso/xebec/sets.c b/sys/netiso/xebec/sets.c
index 6022a894434d..cd510db22fa4 100644
--- a/sys/netiso/xebec/sets.c
+++ b/sys/netiso/xebec/sets.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/sets.c,v 1.1.1.1 1994/05/24 10:07:45 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/sets.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/sets.c,v 1.2 1995/05/30 08:12:12 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/sets.c,v */
 /*
  * This code is such a kludge that I don't want to put my name on it.
  * It was a ridiculously fast hack and needs rewriting.
diff --git a/sys/netiso/xebec/sets.h b/sys/netiso/xebec/sets.h
index 15168ef26b0d..e940e1cc4845 100644
--- a/sys/netiso/xebec/sets.h
+++ b/sys/netiso/xebec/sets.h
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/sets.h,v 1.1.1.1 1994/05/24 10:07:44 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/sets.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/sets.h,v 1.2 1995/05/30 08:12:14 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/sets.h,v */
 
 #define MAXEVENTS 200
 #define MAXSTATES 200
diff --git a/sys/netiso/xebec/test.trans b/sys/netiso/xebec/test.trans
index 49db36109943..00604c2b4843 100644
--- a/sys/netiso/xebec/test.trans
+++ b/sys/netiso/xebec/test.trans
@@ -1,4 +1,4 @@
-/* $Header: test.trans,v 0.2 88/09/19 12:58:29 nhall Exp $
+/* /home/ncvs/src/sys/netiso/xebec/test.trans,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp
  */
 *PROTOCOL test
 
diff --git a/sys/netiso/xebec/xebec.c b/sys/netiso/xebec/xebec.c
index 40f862fe10a3..26a115de2c0e 100644
--- a/sys/netiso/xebec/xebec.c
+++ b/sys/netiso/xebec/xebec.c
@@ -1,5 +1,5 @@
-/* $Header: /home/ncvs/src/sys/netiso/xebec/xebec.c,v 1.1.1.1 1994/05/24 10:07:43 rgrimes Exp $ */
-/* $Source: /home/ncvs/src/sys/netiso/xebec/xebec.c,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/xebec.c,v 1.2 1995/05/30 08:12:16 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/xebec.c,v */
 
 #include "xebec.h"
 #include "llparse.h"
diff --git a/sys/netiso/xebec/xebec.h b/sys/netiso/xebec/xebec.h
index 168bb77b249d..9f37747230ae 100644
--- a/sys/netiso/xebec/xebec.h
+++ b/sys/netiso/xebec/xebec.h
@@ -1,5 +1,5 @@
-/* $Header: xebec.h,v 2.1 88/09/19 12:56:35 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/xebec.h,v $ */
+/* /home/ncvs/src/sys/netiso/xebec/xebec.h,v 1.1.1.1 1994/05/24 10:07:40 rgrimes Exp */
+/* /home/ncvs/src/sys/netiso/xebec/xebec.h,v */
 
 union llattrib {
 	struct {
diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index 96b8694d2fc7..dc8d763def8e 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp.h	8.1 (Berkeley) 6/10/93
- * $Id: idp.h,v 1.2 1994/08/02 07:51:40 davidg Exp $
+ * idp.h,v 1.3 1994/08/21 06:22:05 paul Exp
  */
 
 #ifndef _NETNS_IDP_H_
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index d6ffaf41a605..a66ce8ad5f83 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: idp_usrreq.c,v 1.3 1994/11/15 14:26:30 bde Exp $
+ * idp_usrreq.c,v 1.4 1995/05/30 08:12:20 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h
index 7ff3823a70fe..da634eb8a3d2 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: idp_var.h,v 1.2 1994/08/02 07:51:42 davidg Exp $
+ * idp_var.h,v 1.3 1994/08/21 06:22:06 paul Exp
  */
 
 #ifndef _NETNS_IDP_VAR_H_
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index 61536e1a0aaf..315c357411db 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.c	8.2 (Berkeley) 11/15/93
- * $Id: ns.c,v 1.3 1994/11/15 14:26:31 bde Exp $
+ * ns.c,v 1.4 1995/05/30 08:12:21 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index 527c6950c9f9..aa08820a83af 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $Id: ns.h,v 1.2 1994/08/02 07:51:44 davidg Exp $
+ * ns.h,v 1.3 1994/08/21 06:22:07 paul Exp
  */
 
 #ifndef _NETNS_NS_H_
diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index 617fb2c0f2eb..74c99ab6784e 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * ns_cksum.c,v 1.2 1994/08/02 07:51:45 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index 0e7e24f0d5a5..4d2b8ffba324 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_error.c,v 1.2 1994/08/02 07:51:46 davidg Exp $
+ * ns_error.c,v 1.3 1995/05/30 08:12:22 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index 5e88b2c8e8ee..ff7a7ec163be 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_error.h,v 1.2 1994/08/02 07:51:47 davidg Exp $
+ * ns_error.h,v 1.3 1994/08/21 06:22:07 paul Exp
  */
 
 #ifndef _NETNS_NS_ERROR_H_
diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h
index a4a955ac82dd..2bf07a84dfcb 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_if.h,v 1.3 1994/08/21 06:22:08 paul Exp $
+ * ns_if.h,v 1.4 1995/03/16 18:15:27 bde Exp
  */
 
 #ifndef _NETNS_NS_IF_H_
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 6fa2e9c0eed5..efd4ae2f2c39 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_input.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_input.c,v 1.4 1995/05/11 00:13:22 wollman Exp $
+ * ns_input.c,v 1.5 1995/05/30 08:12:27 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index e87e1656bc22..4281401c1b40 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_ip.c,v 1.2 1994/08/02 07:51:50 davidg Exp $
+ * ns_ip.c,v 1.3 1995/03/19 14:29:03 davidg Exp
  */
 
 /*
diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c
index 8b044896d4ea..5313362f21a9 100644
--- a/sys/netns/ns_output.c
+++ b/sys/netns/ns_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_output.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * ns_output.c,v 1.2 1994/08/02 07:51:51 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index 754c9fb7f9dc..e0c99a6ee161 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_pcb.c,v 1.2 1994/08/02 07:51:52 davidg Exp $
+ * ns_pcb.c,v 1.3 1995/05/30 08:12:28 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 69bd331f12a9..4c8162d713d4 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_pcb.h,v 1.2 1994/08/02 07:51:53 davidg Exp $
+ * ns_pcb.h,v 1.3 1994/08/21 06:22:09 paul Exp
  */
 
 #ifndef _NETNS_NS_PCB_H_
diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index 3352aa0d7cb7..ab7f50461cd9 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)ns_proto.c	8.1 (Berkeley) 6/10/93
- *	$Id: ns_proto.c,v 1.3 1995/05/11 00:13:23 wollman Exp $
+ *	ns_proto.c,v 1.4 1995/05/30 08:12:30 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/sp.h b/sys/netns/sp.h
index 78b913403542..53ccb4896195 100644
--- a/sys/netns/sp.h
+++ b/sys/netns/sp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sp.h	8.1 (Berkeley) 6/10/93
- * $Id: sp.h,v 1.2 1994/08/02 07:51:55 davidg Exp $
+ * sp.h,v 1.3 1994/08/21 06:22:09 paul Exp
  */
 
 #ifndef _NETNS_SP_H_
diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h
index 5642f4a6b137..d79853a30092 100644
--- a/sys/netns/spidp.h
+++ b/sys/netns/spidp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spidp.h	8.1 (Berkeley) 6/10/93
- * $Id: spidp.h,v 1.2 1994/08/02 07:51:56 davidg Exp $
+ * spidp.h,v 1.3 1994/08/21 06:22:10 paul Exp
  */
 
 #ifndef _NETNS_SPIDP_H_
diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index f979a1ec9b89..4607ad37a5d7 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * spp_debug.c,v 1.2 1994/08/02 07:51:57 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index 51132e513ead..1749ac177d8a 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id: spp_debug.h,v 1.2 1994/08/02 07:51:58 davidg Exp $
+ * spp_debug.h,v 1.3 1994/08/21 06:22:11 paul Exp
  */
 
 #ifndef _NETNS_SPP_DEBUG_H_
diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h
index d480f20701e5..006dadb65642 100644
--- a/sys/netns/spp_timer.h
+++ b/sys/netns/spp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id: spp_timer.h,v 1.2 1994/08/02 07:51:59 davidg Exp $
+ * spp_timer.h,v 1.3 1994/08/21 06:22:11 paul Exp
  */
 
 #ifndef _NETNS_SPP_TIMER_H_
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index fbce16af404a..5c420ef2cbbd 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: spp_usrreq.c,v 1.3 1995/03/19 14:29:04 davidg Exp $
+ * spp_usrreq.c,v 1.4 1995/05/30 08:12:31 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index 98141671e02d..553ea9f606f7 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: spp_var.h,v 1.2 1994/08/02 07:52:01 davidg Exp $
+ * spp_var.h,v 1.3 1994/08/21 06:22:12 paul Exp
  */
 
 #ifndef _NETNS_SPP_VAR_H_
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index cbf80c6d7fd6..5616277ab71d 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.8 1994/11/02 00:11:00 wollman Exp $
+ * nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index f92901262000..366f7ee71f35 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.5 (Berkeley) 1/4/94
- * $Id: nfs_bio.c,v 1.13 1995/05/21 21:39:21 davidg Exp $
+ * nfs_bio.c,v 1.14 1995/05/30 08:12:35 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index e5315f449b14..54995e610be5 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.2 (Berkeley) 12/30/93
- * $Id: nfs_node.c,v 1.7 1994/10/17 17:47:33 phk Exp $
+ * nfs_node.c,v 1.8 1995/03/16 18:15:36 bde Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 81571de2764a..44f8cdf7db33 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_nqlease.c,v 1.10 1995/02/15 03:39:58 davidg Exp $
+ * nfs_nqlease.c,v 1.11 1995/05/30 08:12:36 rgrimes Exp
  */
 
 /*
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 6e2102378cac..085d1de3eabc 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.14 1995/05/30 08:12:38 rgrimes Exp $
+ * nfs_serv.c,v 1.14.2.1 1995/06/07 07:25:09 davidg Exp
  */
 
 /*
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 20253efb018b..1bb419274580 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.6 1995/03/16 18:15:37 bde Exp $
+ * nfs_socket.c,v 1.7 1995/05/30 08:12:40 rgrimes Exp
  */
 
 /*
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 0f31ae08a4ae..af08c5a86db2 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.1 (Berkeley) 6/10/93
- * $Id: nfs_srvcache.c,v 1.4 1994/10/02 17:27:00 phk Exp $
+ * nfs_srvcache.c,v 1.5 1994/10/17 17:47:36 phk Exp
  */
 
 /*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 9aeb0d6e84b3..1545d62dac13 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.14 1995/05/29 04:01:09 davidg Exp $
+ * nfs_subs.c,v 1.15 1995/05/30 08:12:43 rgrimes Exp
  */
 
 /*
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index f7e159fd6235..80723a369c8a 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.5 1994/10/17 17:47:38 phk Exp $
+ * nfs_syscalls.c,v 1.6 1995/05/30 08:12:45 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 8140f03ed74f..f62f315d41b1 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.14 1995/05/30 08:12:46 rgrimes Exp $
+ * nfs_vfsops.c,v 1.14.2.1 1995/06/02 11:13:15 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 46484eae91aa..e903448a6db6 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.14 1995/03/23 09:43:40 davidg Exp $
+ * nfs_vnops.c,v 1.15 1995/05/30 08:12:49 rgrimes Exp
  */
 
 /*
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index 5df85e0f6592..cfd3b6394330 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsdiskless.h,v 1.3 1994/08/05 09:28:49 davidg Exp $
+ * nfsdiskless.h,v 1.4 1994/08/21 06:50:09 paul Exp
  */
 
 #ifndef _NFS_NFSDISKLESS_H_
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index 030a985b40d1..7107a5ad19f8 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
- * $Id: nfsm_subs.h,v 1.5 1994/10/17 17:47:42 phk Exp $
+ * nfsm_subs.h,v 1.6 1995/05/30 08:12:51 rgrimes Exp
  */
 
 #ifndef _NFS_NFSM_SUBS_H_
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 99a1b48795f4..e8ba26d23ef7 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsmount.h,v 1.3 1994/08/21 06:50:10 paul Exp $
+ * nfsmount.h,v 1.4 1994/10/17 17:47:43 phk Exp
  */
 
 #ifndef _NFS_NFSMOUNT_H_
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index dc9162b061cc..d6f9d127ccbb 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.8 1994/10/17 17:47:44 phk Exp $
+ * nfsnode.h,v 1.9 1995/03/16 18:15:42 bde Exp
  */
 
 #ifndef _NFS_NFSNODE_H_
diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h
index 4463f621645d..60b3aa41c26d 100644
--- a/sys/nfs/nfsrtt.h
+++ b/sys/nfs/nfsrtt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrtt.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsrtt.h,v 1.2 1994/08/02 07:52:24 davidg Exp $
+ * nfsrtt.h,v 1.3 1994/08/21 06:50:12 paul Exp
  */
 
 #ifndef _NFS_NFSRTT_H_
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index b367b9f4a2c9..4df2ba47c90b 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsrvcache.h,v 1.3 1994/08/21 06:50:13 paul Exp $
+ * nfsrvcache.h,v 1.4 1994/10/17 17:47:44 phk Exp
  */
 
 #ifndef _NFS_NFSRVCACHE_H_
diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index 62ba33899be1..4b2c384d3a1f 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsv2.h,v 1.3 1994/08/18 22:35:37 wollman Exp $
+ * nfsv2.h,v 1.4 1994/08/21 06:50:13 paul Exp
  */
 
 #ifndef _NFS_NFSV2_H_
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 0f8f12b238dc..1d5e52dfb8d6 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nqnfs.h,v 1.5 1994/10/02 17:27:07 phk Exp $
+ * nqnfs.h,v 1.6 1994/10/17 17:47:45 phk Exp
  */
 
 #ifndef _NFS_NQNFS_H_
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 2360cdc3c40a..186b085a78fc 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
- * $Id: rpcv2.h,v 1.2 1994/08/02 07:52:29 davidg Exp $
+ * rpcv2.h,v 1.3 1994/08/21 06:50:15 paul Exp
  */
 
 #ifndef _NFS_RPCV2_H_
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index ac00385e7da0..d8a17dc7ac84 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.1 (Berkeley) 6/10/93
- * $Id: xdr_subs.h,v 1.3 1994/08/21 06:50:16 paul Exp $
+ * xdr_subs.h,v 1.4 1995/01/10 13:11:42 davidg Exp
  */
 
 #ifndef _NFS_XDR_SUBS_H_
diff --git a/sys/pci/README.de b/sys/pci/README.de
index fb81945c4d73..a53ee16c9ac1 100644
--- a/sys/pci/README.de
+++ b/sys/pci/README.de
@@ -1,4 +1,4 @@
-$Id: README.de,v 1.3 1994/10/12 11:19:36 se Exp $
+README.de,v 1.4 1994/10/29 13:13:39 jkh Exp
 
 ----------------
 
diff --git a/sys/pci/README.de-le b/sys/pci/README.de-le
index 60cd2e2750e0..2c35928a810c 100644
--- a/sys/pci/README.de-le
+++ b/sys/pci/README.de-le
@@ -1,4 +1,4 @@
-$Id: README.de-le,v 1.1 1994/10/01 20:16:44 wollman Exp $
+README.de-le,v 1.2 1994/10/29 13:13:40 jkh Exp
 
 ----------------
 
diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c
index 760c8f705041..9e1fc90757c7 100644
--- a/sys/pci/aic7870.c
+++ b/sys/pci/aic7870.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7870.c,v 1.10.2.1 1995/06/04 09:15:44 davidg Exp $
+ *	aic7870.c,v 1.10.2.2 1995/06/09 18:06:53 davidg Exp
  */
 
 #include <pci.h>
diff --git a/sys/pci/dc21040.h b/sys/pci/dc21040.h
index cda354c7dba1..623e72f153b0 100644
--- a/sys/pci/dc21040.h
+++ b/sys/pci/dc21040.h
@@ -21,9 +21,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: dc21040.h,v 1.3 1995/05/05 19:44:34 thomas Exp $
+ * dc21040.h,v 1.4 1995/05/05 20:09:48 davidg Exp
+ *
+ * dc21040.h,v
+ * Revision 1.4  1995/05/05  20:09:48  davidg
+ * Fixed mbuf leak and panic that occurred when packets got too memory
+ * fragmented.
+ * Added support for Cogent em100 boards.
+ * Fixed bug that caused BPF to toggle the card to UTP.
+ * Various other improvements.
+ *
+ * Submitted by:	Matt Thomas and David Greenman
  *
- * $Log: dc21040.h,v $
  * Revision 1.3  1995/05/05  19:44:34  thomas
  * cogent em100 support
  *
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 2ae97a637ffc..22a3a1f35a29 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.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.
  *
- * $Id: if_de.c,v 1.28 1995/05/30 08:13:02 rgrimes Exp $
+ * if_de.c,v 1.28.2.1 1995/06/02 10:44:24 davidg Exp
  *
  */
 
diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c
index 2c8885bde871..b507d06f67aa 100644
--- a/sys/pci/if_pdq.c
+++ b/sys/pci/if_pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_pdq.c,v 1.5 1995/04/05 08:19:23 davidg Exp $
+ * if_pdq.c,v 1.6 1995/05/30 08:13:04 rgrimes Exp
  *
  */
 
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 74fb3c5d3eaa..ea70295a6376 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.36 1995/03/31 00:05:08 se Exp $
+**  ncr.c,v 1.37 1995/05/30 08:13:07 rgrimes Exp
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -1216,7 +1216,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.36 1995/03/31 00:05:08 se Exp $\n";
+	"\nncr.c,v 1.37 1995/05/30 08:13:07 rgrimes Exp\n";
 
 u_long	ncr_version = NCR_VERSION
 	+ (u_long) sizeof (struct ncb)
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index 1a8b9f1c1dcb..123e48e88ef0 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncrreg.h,v 1.2 1995/02/02 13:12:16 davidg Exp $
+**  ncrreg.h,v 1.3 1995/03/21 22:48:36 se Exp
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 0d0c2f82d0fc..7dcd3f56d789 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.22 1995/05/04 06:57:11 davidg Exp $
+**  pci.c,v 1.23 1995/05/30 08:13:09 rgrimes Exp
 **
 **  General subroutines for the PCI bus.
 **  pci_configure ()
diff --git a/sys/pci/pcibus.h b/sys/pci/pcibus.h
index 842d97c6dfa0..8dc49065e849 100644
--- a/sys/pci/pcibus.h
+++ b/sys/pci/pcibus.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.h,v 1.1 1995/02/01 22:56:47 se Exp $
+**  pcibus.h,v 1.2 1995/03/21 23:01:03 se Exp
 **
 **  Declarations for pci bus driver.
 **
diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h
index a1fbcdf0c18f..ccbe65360ed4 100644
--- a/sys/pci/pcireg.h
+++ b/sys/pci/pcireg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcireg.h,v 1.4 1995/02/02 22:01:40 se Exp $
+**  pcireg.h,v 1.5 1995/03/21 23:01:04 se Exp
 **
 **  Names for PCI configuration space registers.
 **
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index c88b86a87fb6..d3d5856cfdbe 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.12 1995/03/17 04:27:20 davidg Exp $
+**  pcisupport.c,v 1.13 1995/03/21 23:01:05 se Exp
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h
index 207a7437d46f..74840b14caf8 100644
--- a/sys/pci/pcivar.h
+++ b/sys/pci/pcivar.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcivar.h,v 1.5 1995/03/25 21:10:38 bde Exp $
+**  pcivar.h,v 1.6 1995/05/30 08:13:12 rgrimes Exp
 **
 **  Declarations for pci device drivers.
 **
diff --git a/sys/pci/pdq.c b/sys/pci/pdq.c
index 610458bd19ec..eb1975133296 100644
--- a/sys/pci/pdq.c
+++ b/sys/pci/pdq.c
@@ -21,9 +21,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq.c,v 1.4 1995/04/01 01:43:56 davidg Exp $
+ * pdq.c,v 1.5 1995/05/30 08:13:13 rgrimes Exp
+ *
+ * pdq.c,v
+ * Revision 1.5  1995/05/30  08:13:13  rgrimes
+ * Remove trailing whitespace.
  *
- * $Log: pdq.c,v $
  * Revision 1.4  1995/04/01  01:43:56  davidg
  * Patch from Matt Thomas to fix mbuf leak in FDDI driver.
  *
diff --git a/sys/pci/pdq_os.h b/sys/pci/pdq_os.h
index 088e5f046279..47d6ac4fad98 100644
--- a/sys/pci/pdq_os.h
+++ b/sys/pci/pdq_os.h
@@ -21,9 +21,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_os.h,v 1.1 1995/03/14 09:16:07 davidg Exp $
+ * pdq_os.h,v 1.2 1995/03/25 22:40:49 bde Exp
+ *
+ * pdq_os.h,v
+ * Revision 1.2  1995/03/25  22:40:49  bde
+ * Remove wrong redeclarations of printf() and bzero().  Include the correct
+ * header to declare DELAY().
  *
- * $Log: pdq_os.h,v $
  * Revision 1.1  1995/03/14  09:16:07  davidg
  * Added support for generic FDDI and the DEC DEFEA and DEFPA FDDI adapters.
  *
diff --git a/sys/pci/pdqreg.h b/sys/pci/pdqreg.h
index 08038f4b7a9a..1af5335fb881 100644
--- a/sys/pci/pdqreg.h
+++ b/sys/pci/pdqreg.h
@@ -21,9 +21,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdqreg.h,v 1.1 1995/03/14 09:16:07 davidg Exp $
+ * pdqreg.h,v 1.2 1995/05/30 08:13:15 rgrimes Exp
+ *
+ * pdqreg.h,v
+ * Revision 1.2  1995/05/30  08:13:15  rgrimes
+ * Remove trailing whitespace.
  *
- * $Log: pdqreg.h,v $
  * Revision 1.1  1995/03/14  09:16:07  davidg
  * Added support for generic FDDI and the DEC DEFEA and DEFPA FDDI adapters.
  *
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 550b5da88ab7..9fecab61a093 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.40 1995/05/03 18:09:06 dufault Exp $
+ *      cd.c,v 1.41 1995/05/30 08:13:20 rgrimes Exp
  */
 
 #define SPLCD splbio
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index a7c36d9efa5a..f60642570093 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -2,7 +2,7 @@
  * Written by grefen@?????
  * Based on scsi drivers by Julian Elischer (julian@tfs.com)
  *
- *      $Id: ch.c,v 1.20 1995/05/11 19:26:46 rgrimes Exp $
+ *      ch.c,v 1.21 1995/05/30 08:13:22 rgrimes Exp
  */
 
 #include	<sys/types.h>
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 2d1a10b62336..af4cb9366813 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.4 1995/05/03 18:09:09 dufault Exp $
+ *      pt.c,v 1.5 1995/05/30 08:13:23 rgrimes Exp
  */
 
 /*
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index 8da591e74323..6205c3d7afce 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_all.h,v 1.12 1995/04/14 15:10:29 dufault Exp $
+ *	scsi_all.h,v 1.13 1995/05/30 08:13:25 rgrimes Exp
  */
 
 /*
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 487173ae1ff0..0b500f2b2b06 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -8,7 +8,7 @@
  * file.
  *
  * Written by Julian Elischer (julian@dialix.oz.au)
- *      $Id: scsi_base.c,v 1.28 1995/04/23 22:07:50 gibbs Exp $
+ *      scsi_base.c,v 1.29 1995/05/30 08:13:27 rgrimes Exp
  */
 
 #define SPLSD splbio
diff --git a/sys/scsi/scsi_cd.h b/sys/scsi/scsi_cd.h
index 7b8f63ccec0f..e55296cd8662 100644
--- a/sys/scsi/scsi_cd.h
+++ b/sys/scsi/scsi_cd.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_cd.h,v 1.6 1993/11/18 05:02:52 rgrimes Exp $
+ *	scsi_cd.h,v 1.7 1995/05/30 08:13:29 rgrimes Exp
  */
 #ifndef	_SCSI_SCSI_CD_H
 #define _SCSI_SCSI_CD_H 1
diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index d7d628af756e..9231b07b9d1a 100644
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -19,7 +19,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_changer.h,v 1.6 1993/11/18 05:02:53 rgrimes Exp $
+ *	scsi_changer.h,v 1.7 1995/05/30 08:13:30 rgrimes Exp
  */
 #ifndef _SCSI_SCSI_CHANGER_H
 #define _SCSI_SCSI_CHANGER_H 1
diff --git a/sys/scsi/scsi_debug.h b/sys/scsi/scsi_debug.h
index 578cd43412d8..f3dc76f9d80b 100644
--- a/sys/scsi/scsi_debug.h
+++ b/sys/scsi/scsi_debug.h
@@ -2,7 +2,7 @@
 /*
  * Written by Julian Elischer (julian@tfs.com)
  *
- *	$Id: scsi_debug.h,v 1.1 1993/11/18 05:02:54 rgrimes Exp $
+ *	scsi_debug.h,v 1.2 1995/05/30 08:13:32 rgrimes Exp
  */
 #ifndef	_SCSI_SCSI_DEBUG_H
 #define _SCSI_SCSI_DEBUG_H 1
diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h
index ecac2a47d926..b2fde3228c06 100644
--- a/sys/scsi/scsi_disk.h
+++ b/sys/scsi/scsi_disk.h
@@ -46,7 +46,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_disk.h,v 1.7 1995/01/08 15:13:40 ats Exp $
+ *	scsi_disk.h,v 1.8 1995/05/30 08:13:35 rgrimes Exp
  */
 
 /*
diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c
index 23370a95558d..4689a5335500 100644
--- a/sys/scsi/scsi_driver.c
+++ b/sys/scsi/scsi_driver.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scsi_driver.c,v 1.9 1995/05/03 18:09:11 dufault Exp $
+ * scsi_driver.c,v 1.10 1995/05/30 08:13:37 rgrimes Exp
  *
  */
 #include <sys/types.h>
diff --git a/sys/scsi/scsi_driver.h b/sys/scsi/scsi_driver.h
index ec2e1c8243e5..1721d37c7cd9 100644
--- a/sys/scsi/scsi_driver.h
+++ b/sys/scsi/scsi_driver.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scsi_driver.h,v 1.3 1995/04/14 15:10:34 dufault Exp $
+ * scsi_driver.h,v 1.4 1995/05/30 08:13:39 rgrimes Exp
  *
  */
 #ifndef _SCSI__DRIVER_H_
diff --git a/sys/scsi/scsi_generic.h b/sys/scsi/scsi_generic.h
index e1a3d883ff5d..4331c4638314 100644
--- a/sys/scsi/scsi_generic.h
+++ b/sys/scsi/scsi_generic.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)stdio.h	5.17 (Berkeley) 6/3/91
- *	$Id: scsi_generic.h,v 1.3 1995/01/08 13:38:31 dufault Exp $
+ *	scsi_generic.h,v 1.4 1995/05/30 08:13:40 rgrimes Exp
  */
 
 /* generic SCSI header file.  We use the same minor number format
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 94713076badd..60432129fb98 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- * $Id: scsi_ioctl.c,v 1.15 1995/05/09 02:38:15 dyson Exp $
+ * scsi_ioctl.c,v 1.16 1995/05/30 08:13:42 rgrimes Exp
  *
  *
  */
diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h
index 0e184d18238f..2ce92d94723c 100644
--- a/sys/scsi/scsi_tape.h
+++ b/sys/scsi/scsi_tape.h
@@ -21,7 +21,7 @@
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_tape.h,v 1.12 1995/04/29 21:30:26 joerg Exp $
+ *	scsi_tape.h,v 1.13 1995/05/30 08:13:43 rgrimes Exp
  */
 #ifndef	SCSI_SCSI_TAPE_H
 #define SCSI_SCSI_TAPE_H 1
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index d1771f89c815..70db3b89737a 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -16,7 +16,7 @@
  *
  * New configuration setup: dufault@hda.com
  *
- *      $Id: scsiconf.c,v 1.29 1995/05/03 18:09:13 dufault Exp $
+ *      scsiconf.c,v 1.30 1995/05/30 08:13:45 rgrimes Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 53574cd06268..159ee96a7d01 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsiconf.h,v 1.25 1995/05/03 18:09:14 dufault Exp $
+ *	scsiconf.h,v 1.26 1995/05/30 08:13:47 rgrimes Exp
  */
 #ifndef	SCSI_SCSICONF_H
 #define SCSI_SCSICONF_H 1
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 2e433acecacd..3abc2f009dc8 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.2 1995/05/03 18:09:15 dufault Exp $
+ *      sctarg.c,v 1.3 1995/05/30 08:13:49 rgrimes Exp
  */
 
 /*
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 1ae8533701bc..b9452c44973e 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.64 1995/05/08 16:53:33 bde Exp $
+ *      sd.c,v 1.65 1995/05/30 08:13:51 rgrimes Exp
  */
 
 #define SPLSD splbio
diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c
index df7fbb680047..849e32b8b272 100644
--- a/sys/scsi/ssc.c
+++ b/sys/scsi/ssc.c
@@ -49,7 +49,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *End copyright
- * $Id: ssc.c,v 1.2 1995/01/08 15:56:09 dufault Exp $
+ * ssc.c,v 1.3 1995/05/03 18:09:18 dufault Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 4320f56180ef..9229c2c33040 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.35 1995/05/03 18:09:19 dufault Exp $
+ * st.c,v 1.36 1995/05/30 08:13:54 rgrimes Exp
  */
 
 /*
diff --git a/sys/scsi/su.c b/sys/scsi/su.c
index dd73c2b7f2fb..a1f1837aec98 100644
--- a/sys/scsi/su.c
+++ b/sys/scsi/su.c
@@ -44,7 +44,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- *      $Id: su.c,v 1.4 1995/03/04 20:51:07 dufault Exp $
+ *      su.c,v 1.5 1995/05/03 18:09:20 dufault Exp
  *
  * Tabstops 4
  */
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index 0518612feb08..a2c2ef7e9e5c 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -2,7 +2,7 @@
  * Driver for a device we can't identify.
  * by Julian Elischer (julian@tfs.com)
  *
- *      $Id: uk.c,v 1.8 1995/03/04 20:51:08 dufault Exp $
+ *      uk.c,v 1.9 1995/05/30 08:13:56 rgrimes Exp
  *
  * If you find that you are adding any code to this file look closely
  * at putting it in "scsi_driver.c" instead.
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index 9f5375d1f5eb..fe442cada2e4 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.6 1995/05/03 23:53:32 dufault Exp $
+ *      worm.c,v 1.7 1995/05/30 08:13:58 rgrimes Exp
  */
 
 /* XXX This is PRELIMINARY.
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 0ea88d8ea112..15c27a80034f 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.2 (Berkeley) 1/21/94
- * $Id: acct.h,v 1.3 1994/08/21 04:41:31 paul Exp $
+ * acct.h,v 1.4 1994/09/26 21:09:15 davidg Exp
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 89d289fbb4fc..36937c39182a 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
- * $Id: buf.h,v 1.18 1995/04/19 10:31:56 davidg Exp $
+ * buf.h,v 1.19 1995/05/30 08:14:07 rgrimes Exp
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 81380b33f4ed..85adda0ce186 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id: callout.h,v 1.3 1994/08/18 22:35:41 wollman Exp $
+ * callout.h,v 1.4 1994/08/21 04:41:33 paul Exp
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 03233d046ca2..b92ab821b2b4 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.7 (Berkeley) 1/21/94
- * $Id: cdefs.h,v 1.7 1994/12/08 15:42:17 bde Exp $
+ * cdefs.h,v 1.8 1994/12/23 22:38:54 nate Exp
  */
 
 #ifndef	_SYS_CDEFS_H_
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 8af5d6524a2e..2bc472236e3b 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- *	$Id: cdio.h,v 1.7 1995/04/09 15:50:48 jkh Exp $
+ *	cdio.h,v 1.8 1995/05/30 08:14:11 rgrimes Exp
  */
 /*
 <1>	Fixed a conflict with ioctl usage.  There were two different
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index cc566ec9b194..a51e749ba8d7 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer		ADDED for SCSI system
  *
- *	$Id: chio.h,v 1.4 1993/11/18 05:03:24 rgrimes Exp $
+ *	chio.h,v 1.5 1995/05/30 08:14:13 rgrimes Exp
  */
 
 /* This is a "convertet" mtio.h from 386BSD
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index f1438a160d2a..0004f7cca889 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $Id: clist.h,v 1.4 1994/08/21 04:41:35 paul Exp $
+ * clist.h,v 1.5 1995/01/07 06:08:15 davidg Exp
  */
 
 #ifndef _SYS_CLIST_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index d42e1163a909..12ef0443ab01 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
- * $Id: conf.h,v 1.14 1995/05/14 03:00:03 davidg Exp $
+ * conf.h,v 1.15 1995/05/30 08:14:14 rgrimes Exp
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/devconf.h b/sys/sys/devconf.h
index d468c33223a8..426479f47328 100644
--- a/sys/sys/devconf.h
+++ b/sys/sys/devconf.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devconf.h,v 1.5 1995/04/12 20:47:13 wollman Exp $
+ *	devconf.h,v 1.6 1995/04/13 20:37:51 wollman Exp
  */
 
 /*
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 2fe1d6a70b3c..cbf059b5e42f 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
- * $Id$
+ * device.h,v 1.2 1994/08/02 07:52:45 davidg Exp
  */
 
 #ifndef _SYS_DEVICE_H_
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index c0347c1ec554..b834ba2602ee 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * dir.h,v 1.2 1994/08/02 07:52:46 davidg Exp
  */
 
 /*
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 53b9e7a4848f..9bcd4c776966 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.1 (Berkeley) 6/2/93
- * $Id: dirent.h,v 1.3 1994/08/21 04:41:38 paul Exp $
+ * dirent.h,v 1.4 1995/05/30 08:14:16 rgrimes Exp
  */
 
 #ifndef _SYS_DIRENT_H_
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index c90eca5b0d32..6bede8188e95 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -41,7 +41,7 @@
  *
  *	@(#)disk.h	8.1 (Berkeley) 6/2/93
  *
- * $Id: disk.h,v 1.2 1994/08/02 07:52:48 davidg Exp $
+ * disk.h,v 1.3 1994/08/21 04:41:39 paul Exp
  */
 
 #ifndef _SYS_DISK_H_
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index f9e77f9d345a..82467f34178b 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id: disklabel.h,v 1.15 1995/05/16 07:52:17 davidg Exp $
+ * disklabel.h,v 1.16 1995/05/30 08:14:17 rgrimes Exp
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index 6721e339d767..8b7a77839660 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: diskslice.h,v 1.9 1995/05/08 16:27:10 bde Exp $
+ *	diskslice.h,v 1.10 1995/05/30 08:14:19 rgrimes Exp
  */
 
 #ifndef _SYS_DISKSLICE_H_
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index eb75c61b0b22..b9eb2994f9bd 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93
- * $Id: dkbad.h,v 1.4 1994/12/11 23:20:50 bde Exp $
+ * dkbad.h,v 1.5 1995/04/15 23:21:28 bde Exp
  */
 
 #ifndef _SYS_DKBAD_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 82dbcbbf72f3..09f7c288b23d 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $Id: dkstat.h,v 1.5 1994/10/16 05:03:05 wollman Exp $
+ * dkstat.h,v 1.6 1994/12/24 10:11:18 bde Exp
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index b9ca5a1e55c6..eee8b657b610 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * dmap.h,v 1.2 1994/08/02 07:52:52 davidg Exp
  */
 
 #ifndef _SYS_DMAP_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 87021f67bd76..6b15e8c3c5c8 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id: domain.h,v 1.4 1995/05/11 00:13:26 wollman Exp $
+ * domain.h,v 1.5 1995/05/15 22:55:18 davidg Exp
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 3bac4ed751de..fb6b60c9a49c 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $Id: errno.h,v 1.2 1994/08/02 07:52:54 davidg Exp $
+ * errno.h,v 1.3 1994/08/21 04:41:42 paul Exp
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index b47b11db3ecd..519edf9579b7 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.9 1994/10/09 21:50:57 sos Exp $
+ * exec.h,v 1.10 1995/03/16 18:16:15 bde Exp
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index b38522f57f3c..938aabbc0e70 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,7 +36,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $Id: fbio.h,v 1.2 1994/08/02 07:52:56 davidg Exp $
+ * fbio.h,v 1.3 1994/08/21 04:41:44 paul Exp
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 33afa9a454d5..0229e286abbc 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * fcntl.h,v 1.2 1994/08/02 07:52:57 davidg Exp
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 309a73258ef6..1aad7a5f62e1 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.1 (Berkeley) 6/2/93
- * $Id: file.h,v 1.4 1995/02/20 19:42:37 guido Exp $
+ * file.h,v 1.5 1995/03/16 18:16:16 bde Exp
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 4742a015394a..e1122deb297a 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $Id: filedesc.h,v 1.5 1995/03/16 18:16:16 bde Exp $
+ * filedesc.h,v 1.6 1995/05/30 08:14:20 rgrimes Exp
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index b82a649c0feb..6723d3c4b14d 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id$
+ * filio.h,v 1.2 1994/08/02 07:53:01 davidg Exp
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index bc60cf4f9c2b..57e76a4d7fa2 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $Id: gmon.h,v 1.5 1995/05/14 03:00:04 davidg Exp $
+ * gmon.h,v 1.6 1995/05/30 08:14:22 rgrimes Exp
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index 354efb2e130a..c0bf016e41d9 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact.h,v 1.8 1994/10/02 17:24:45 phk Exp $
+ *	imgact.h,v 1.9 1995/05/30 08:14:24 rgrimes Exp
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index 50d597950c5e..e624b999f34d 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- *	$Id: imgact_aout.h,v 1.2 1994/12/30 08:06:19 bde Exp $
+ *	imgact_aout.h,v 1.3 1995/05/30 08:14:25 rgrimes Exp
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index a16ce4f1152d..c3b87a9dfd7c 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.h,v 1.5 1995/04/15 06:54:04 phk Exp $
+ * inflate.h,v 1.6 1995/05/30 08:14:27 rgrimes Exp
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 9958ac77d344..6ad747df6228 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $Id$
+ * ioccom.h,v 1.2 1994/08/02 07:53:03 davidg Exp
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index abe902f57825..39a0b81a188a 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id$
+ * ioctl.h,v 1.2 1994/08/02 07:53:04 davidg Exp
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index ab067b97e42b..e12a3f6fd602 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * ioctl_compat.h,v 1.2 1994/08/02 07:53:05 davidg Exp
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 4e537845e566..e5ad41e153d4 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.3 (Berkeley) 1/21/94
- * $Id: ipc.h,v 1.4 1994/10/02 17:24:47 phk Exp $
+ * ipc.h,v 1.5 1994/12/30 05:38:14 davidg Exp
  */
 
 /*
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 7c032b2a03f0..e9a6c4306400 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id: kernel.h,v 1.8 1995/03/17 22:02:05 wollman Exp $
+ * kernel.h,v 1.9 1995/03/20 19:20:26 wollman Exp
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 15f14b534985..3ad92040de14 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $Id: ktrace.h,v 1.6 1994/10/02 17:24:48 phk Exp $
+ * ktrace.h,v 1.7 1995/03/16 18:16:19 bde Exp
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 6264baa440f8..1769a7d9c2fc 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $Id: libkern.h,v 1.6 1995/03/16 18:12:58 bde Exp $
+ * libkern.h,v 1.7 1995/04/23 08:05:25 bde Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
deleted file mode 100644
index 38c9c4028ecb..000000000000
--- a/sys/sys/link_aout.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Paul Kranenburg.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
- *
- *	$Id: link.h,v 1.3 1995/02/07 13:26:39 jkh Exp $
- */
-
-/*
- * RRS section definitions.
- *
- * The layout of some data structures defined in this header file is
- * such that we can provide compatibility with the SunOS 4.x shared
- * library scheme.
- */
-
-#ifndef _LINK_H_
-#define _LINK_H_
-
-/*
- * A `Shared Object Descriptor' descibes a shared object that is needed
- * to complete the link edit process of the object containing it.
- * A list of such objects (chained through `sod_next') is pointed at
- * by `sdt_sods' in the section_dispatch_table structure.
- */
-
-struct sod {	/* Shared Object Descriptor */
-	long	sod_name;		/* name (relative to load address) */
-	u_int	sod_library  : 1,	/* Searched for by library rules */
-		sod_reserved : 31;
-	short	sod_major;		/* major version number */
-	short	sod_minor;		/* minor version number */
-	long	sod_next;		/* next sod */
-};
-
-/*
- * `Shared Object Map's are used by the run-time link editor (ld.so) to
- * keep track of all shared objects loaded into a process' address space.
- * These structures are only used at run-time and do not occur within
- * the text or data segment of an executable or shared library.
- */
-struct so_map {		/* Shared Object Map */
-	caddr_t		som_addr;	/* Address at which object mapped */
-	char 		*som_path;	/* Path to mmap'ed file */
-	struct so_map	*som_next;	/* Next map in chain */
-	struct sod	*som_sod;	/* Sod responsible for this map */
-	caddr_t		som_sodbase;	/* Base address of this sod */
-	u_int		som_write : 1;	/* Text is currently writable */
-	struct _dynamic	*som_dynamic;	/* _dynamic structure */
-	caddr_t		som_spd;	/* Private data */
-};
-
-/*
- * Symbol description with size. This is simply an `nlist' with
- * one field (nz_size) added.
- * Used to convey size information on items in the data segment
- * of shared objects. An array of these live in the shared object's
- * text segment and is addressed by the `sdt_nzlist' field.
- */
-struct nzlist {
-	struct nlist	nlist;
-	u_long		nz_size;
-#define nz_un		nlist.n_un
-#define nz_strx		nlist.n_un.n_strx
-#define nz_name		nlist.n_un.n_name
-#define nz_type		nlist.n_type
-#define nz_value	nlist.n_value
-#define nz_desc		nlist.n_desc
-#define nz_other	nlist.n_other
-};
-
-#define N_AUX(p)	((p)->n_other & 0xf)
-#define N_BIND(p)	(((unsigned int)(p)->n_other >> 4) & 0xf)
-#define N_OTHER(r, v)	(((unsigned int)(r) << 4) | ((v) & 0xf))
-
-#define AUX_OBJECT	1
-#define AUX_FUNC	2
-/*#define BIND_LOCAL	0	not used */
-/*#define BIND_GLOBAL	1	not used */
-#define BIND_WEAK	2
-
-
-/*
- * The `section_dispatch_table' structure contains offsets to various data
- * structures needed to do run-time relocation.
- */
-struct section_dispatch_table {
-	struct so_map *sdt_loaded;	/* List of loaded objects */
-	long	sdt_sods;		/* List of shared objects descriptors */
-	long	sdt_filler1;		/* Unused (was: search rules) */
-	long	sdt_got;		/* Global offset table */
-	long	sdt_plt;		/* Procedure linkage table */
-	long	sdt_rel;		/* Relocation table */
-	long	sdt_hash;		/* Symbol hash table */
-	long	sdt_nzlist;		/* Symbol table itself */
-	long	sdt_filler2;		/* Unused (was: stab_hash) */
-	long	sdt_buckets;		/* Number of hash buckets */
-	long	sdt_strings;		/* Symbol strings */
-	long	sdt_str_sz;		/* Size of symbol strings */
-	long	sdt_text_sz;		/* Size of text area */
-	long	sdt_plt_sz;		/* Size of procedure linkage table */
-};
-
-/*
- * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table.
- * Used to quickly lookup symbols of the shared object by hashing
- * on the symbol's name. `rh_symbolnum' is the index of the symbol
- * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is
- * the next symbol in the hash bucket (in case of collisions).
- */
-struct rrs_hash {
-	int	rh_symbolnum;		/* Symbol number */
-	int	rh_next;		/* Next hash entry */
-};
-
-/*
- * `rt_symbols' is used to keep track of run-time allocated commons
- * and data items copied from shared objects.
- */
-struct rt_symbol {
-	struct nzlist		*rt_sp;		/* The symbol */
-	struct rt_symbol	*rt_next;	/* Next in linear list */
-	struct rt_symbol	*rt_link;	/* Next in bucket */
-	caddr_t			rt_srcaddr;	/* Address of "master" copy */
-	struct so_map		*rt_smp;	/* Originating map */
-};
-
-/*
- * Debugger interface structure.
- */
-struct so_debug {
-	int	dd_version;		/* Version # of interface */
-	int	dd_in_debugger;		/* Set when run by debugger */
-	int	dd_sym_loaded;		/* Run-time linking brought more
-					   symbols into scope */
-	char   	 *dd_bpt_addr;		/* Address of rtld-generated bpt */
-	int	dd_bpt_shadow;		/* Original contents of bpt */
-	struct rt_symbol *dd_cc;	/* Allocated commons/copied data */
-};
-
-/*
- * Entry points into ld.so - user interface to the run-time linker.
- */
-struct ld_entry {
-	void	*(*dlopen) __P((char *, int));
-	int	(*dlclose) __P((void *));
-	void	*(*dlsym) __P((void *, char *));
-	char	*(*dlerror) __P((void));
-};
-
-/*
- * dl*() prototypes.
- */
-extern void	*dlopen __P((char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
-extern char	*dlerror __P((void));
-
-
-/*
- * This is the structure pointed at by the __DYNAMIC symbol if an
- * executable requires the attention of the run-time link editor.
- * __DYNAMIC is given the value zero if no run-time linking needs to
- * be done (it is always present in shared objects).
- * The union `d_un' provides for different versions of the dynamic
- * linking mechanism (switched on by `d_version'). The last version
- * used by Sun is 3. We leave some room here and go to version number
- * 8 for NetBSD, the main difference lying in the support for the
- * `nz_list' type of symbols.
- */
-
-struct	_dynamic {
-	int		d_version;	/* version # of this interface */
-	struct so_debug	*d_debug;
-	union {
-		struct section_dispatch_table *d_sdt;
-	} d_un;
-	struct ld_entry *d_entry;	/* XXX */
-};
-
-#define LD_VERSION_SUN		(3)
-#define LD_VERSION_BSD		(8)
-#define LD_VERSION_NZLIST_P(v)	((v) >= 8)
-
-#define LD_GOT(x)	((x)->d_un.d_sdt->sdt_got)
-#define LD_PLT(x)	((x)->d_un.d_sdt->sdt_plt)
-#define LD_REL(x)	((x)->d_un.d_sdt->sdt_rel)
-#define LD_SYMBOL(x)	((x)->d_un.d_sdt->sdt_nzlist)
-#define LD_HASH(x)	((x)->d_un.d_sdt->sdt_hash)
-#define LD_STRINGS(x)	((x)->d_un.d_sdt->sdt_strings)
-#define LD_NEED(x)	((x)->d_un.d_sdt->sdt_sods)
-#define LD_BUCKETS(x)	((x)->d_un.d_sdt->sdt_buckets)
-
-#define LD_GOTSZ(x)	((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got)
-#define LD_RELSZ(x)	((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel)
-#define LD_HASHSZ(x)	((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash)
-#define LD_STABSZ(x)	((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist)
-#define LD_PLTSZ(x)	((x)->d_un.d_sdt->sdt_plt_sz)
-#define LD_STRSZ(x)	((x)->d_un.d_sdt->sdt_str_sz)
-#define LD_TEXTSZ(x)	((x)->d_un.d_sdt->sdt_text_sz)
-
-/*
- * Interface to ld.so
- */
-struct crt_ldso {
-	int		crt_ba;		/* Base address of ld.so */
-	int		crt_dzfd;	/* "/dev/zero" file decriptor (SunOS) */
-	int		crt_ldfd;	/* ld.so file descriptor */
-	struct _dynamic	*crt_dp;	/* Main's __DYNAMIC */
-	char		**crt_ep;	/* environment strings */
-	caddr_t		crt_bp;		/* Breakpoint if run from debugger */
-	char		*crt_prog;	/* Program name (v3) */
-	char		*crt_ldso;	/* Link editor name (v4) */
-	struct ld_entry	*crt_ldentry;	/* dl*() access (v4) */
-};
-
-/*
- * Version passed from crt0 to ld.so (1st argument to _rtld()).
- */
-#define CRT_VERSION_SUN		1
-#define CRT_VERSION_BSD_2	2
-#define CRT_VERSION_BSD_3	3
-#define CRT_VERSION_BSD_4	4
-
-
-/*
- * Maximum number of recognized shared object version numbers.
- */
-#define MAXDEWEY	8
-
-/*
- * Header of the hints file.
- */
-struct hints_header {
-	long		hh_magic;
-#define HH_MAGIC	011421044151
-	long		hh_version;	/* Interface version number */
-#define LD_HINTS_VERSION_1	1
-	long		hh_hashtab;	/* Location of hash table */
-	long		hh_nbucket;	/* Number of buckets in hashtab */
-	long		hh_strtab;	/* Location of strings */
-	long		hh_strtab_sz;	/* Size of strings */
-	long		hh_ehints;	/* End of hints (max offset in file) */
-};
-
-#define HH_BADMAG(hdr)	((hdr).hh_magic != HH_MAGIC)
-
-/*
- * Hash table element in hints file.
- */
-struct hints_bucket {
-	/* namex and pathx are indices into the string table */
-	int		hi_namex;		/* Library name */
-	int		hi_pathx;		/* Full path */
-	int		hi_dewey[MAXDEWEY];	/* The versions */
-	int		hi_ndewey;		/* Number of version numbers */
-#define hi_major hi_dewey[0]
-#define hi_minor hi_dewey[1]
-	int		hi_next;		/* Next in this bucket */
-};
-
-#define _PATH_LD_HINTS		"/var/run/ld.so.hints"
-
-#endif /* _LINK_H_ */
-
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
deleted file mode 100644
index 38c9c4028ecb..000000000000
--- a/sys/sys/link_elf.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Paul Kranenburg.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software withough specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
- *
- *	$Id: link.h,v 1.3 1995/02/07 13:26:39 jkh Exp $
- */
-
-/*
- * RRS section definitions.
- *
- * The layout of some data structures defined in this header file is
- * such that we can provide compatibility with the SunOS 4.x shared
- * library scheme.
- */
-
-#ifndef _LINK_H_
-#define _LINK_H_
-
-/*
- * A `Shared Object Descriptor' descibes a shared object that is needed
- * to complete the link edit process of the object containing it.
- * A list of such objects (chained through `sod_next') is pointed at
- * by `sdt_sods' in the section_dispatch_table structure.
- */
-
-struct sod {	/* Shared Object Descriptor */
-	long	sod_name;		/* name (relative to load address) */
-	u_int	sod_library  : 1,	/* Searched for by library rules */
-		sod_reserved : 31;
-	short	sod_major;		/* major version number */
-	short	sod_minor;		/* minor version number */
-	long	sod_next;		/* next sod */
-};
-
-/*
- * `Shared Object Map's are used by the run-time link editor (ld.so) to
- * keep track of all shared objects loaded into a process' address space.
- * These structures are only used at run-time and do not occur within
- * the text or data segment of an executable or shared library.
- */
-struct so_map {		/* Shared Object Map */
-	caddr_t		som_addr;	/* Address at which object mapped */
-	char 		*som_path;	/* Path to mmap'ed file */
-	struct so_map	*som_next;	/* Next map in chain */
-	struct sod	*som_sod;	/* Sod responsible for this map */
-	caddr_t		som_sodbase;	/* Base address of this sod */
-	u_int		som_write : 1;	/* Text is currently writable */
-	struct _dynamic	*som_dynamic;	/* _dynamic structure */
-	caddr_t		som_spd;	/* Private data */
-};
-
-/*
- * Symbol description with size. This is simply an `nlist' with
- * one field (nz_size) added.
- * Used to convey size information on items in the data segment
- * of shared objects. An array of these live in the shared object's
- * text segment and is addressed by the `sdt_nzlist' field.
- */
-struct nzlist {
-	struct nlist	nlist;
-	u_long		nz_size;
-#define nz_un		nlist.n_un
-#define nz_strx		nlist.n_un.n_strx
-#define nz_name		nlist.n_un.n_name
-#define nz_type		nlist.n_type
-#define nz_value	nlist.n_value
-#define nz_desc		nlist.n_desc
-#define nz_other	nlist.n_other
-};
-
-#define N_AUX(p)	((p)->n_other & 0xf)
-#define N_BIND(p)	(((unsigned int)(p)->n_other >> 4) & 0xf)
-#define N_OTHER(r, v)	(((unsigned int)(r) << 4) | ((v) & 0xf))
-
-#define AUX_OBJECT	1
-#define AUX_FUNC	2
-/*#define BIND_LOCAL	0	not used */
-/*#define BIND_GLOBAL	1	not used */
-#define BIND_WEAK	2
-
-
-/*
- * The `section_dispatch_table' structure contains offsets to various data
- * structures needed to do run-time relocation.
- */
-struct section_dispatch_table {
-	struct so_map *sdt_loaded;	/* List of loaded objects */
-	long	sdt_sods;		/* List of shared objects descriptors */
-	long	sdt_filler1;		/* Unused (was: search rules) */
-	long	sdt_got;		/* Global offset table */
-	long	sdt_plt;		/* Procedure linkage table */
-	long	sdt_rel;		/* Relocation table */
-	long	sdt_hash;		/* Symbol hash table */
-	long	sdt_nzlist;		/* Symbol table itself */
-	long	sdt_filler2;		/* Unused (was: stab_hash) */
-	long	sdt_buckets;		/* Number of hash buckets */
-	long	sdt_strings;		/* Symbol strings */
-	long	sdt_str_sz;		/* Size of symbol strings */
-	long	sdt_text_sz;		/* Size of text area */
-	long	sdt_plt_sz;		/* Size of procedure linkage table */
-};
-
-/*
- * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table.
- * Used to quickly lookup symbols of the shared object by hashing
- * on the symbol's name. `rh_symbolnum' is the index of the symbol
- * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is
- * the next symbol in the hash bucket (in case of collisions).
- */
-struct rrs_hash {
-	int	rh_symbolnum;		/* Symbol number */
-	int	rh_next;		/* Next hash entry */
-};
-
-/*
- * `rt_symbols' is used to keep track of run-time allocated commons
- * and data items copied from shared objects.
- */
-struct rt_symbol {
-	struct nzlist		*rt_sp;		/* The symbol */
-	struct rt_symbol	*rt_next;	/* Next in linear list */
-	struct rt_symbol	*rt_link;	/* Next in bucket */
-	caddr_t			rt_srcaddr;	/* Address of "master" copy */
-	struct so_map		*rt_smp;	/* Originating map */
-};
-
-/*
- * Debugger interface structure.
- */
-struct so_debug {
-	int	dd_version;		/* Version # of interface */
-	int	dd_in_debugger;		/* Set when run by debugger */
-	int	dd_sym_loaded;		/* Run-time linking brought more
-					   symbols into scope */
-	char   	 *dd_bpt_addr;		/* Address of rtld-generated bpt */
-	int	dd_bpt_shadow;		/* Original contents of bpt */
-	struct rt_symbol *dd_cc;	/* Allocated commons/copied data */
-};
-
-/*
- * Entry points into ld.so - user interface to the run-time linker.
- */
-struct ld_entry {
-	void	*(*dlopen) __P((char *, int));
-	int	(*dlclose) __P((void *));
-	void	*(*dlsym) __P((void *, char *));
-	char	*(*dlerror) __P((void));
-};
-
-/*
- * dl*() prototypes.
- */
-extern void	*dlopen __P((char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
-extern char	*dlerror __P((void));
-
-
-/*
- * This is the structure pointed at by the __DYNAMIC symbol if an
- * executable requires the attention of the run-time link editor.
- * __DYNAMIC is given the value zero if no run-time linking needs to
- * be done (it is always present in shared objects).
- * The union `d_un' provides for different versions of the dynamic
- * linking mechanism (switched on by `d_version'). The last version
- * used by Sun is 3. We leave some room here and go to version number
- * 8 for NetBSD, the main difference lying in the support for the
- * `nz_list' type of symbols.
- */
-
-struct	_dynamic {
-	int		d_version;	/* version # of this interface */
-	struct so_debug	*d_debug;
-	union {
-		struct section_dispatch_table *d_sdt;
-	} d_un;
-	struct ld_entry *d_entry;	/* XXX */
-};
-
-#define LD_VERSION_SUN		(3)
-#define LD_VERSION_BSD		(8)
-#define LD_VERSION_NZLIST_P(v)	((v) >= 8)
-
-#define LD_GOT(x)	((x)->d_un.d_sdt->sdt_got)
-#define LD_PLT(x)	((x)->d_un.d_sdt->sdt_plt)
-#define LD_REL(x)	((x)->d_un.d_sdt->sdt_rel)
-#define LD_SYMBOL(x)	((x)->d_un.d_sdt->sdt_nzlist)
-#define LD_HASH(x)	((x)->d_un.d_sdt->sdt_hash)
-#define LD_STRINGS(x)	((x)->d_un.d_sdt->sdt_strings)
-#define LD_NEED(x)	((x)->d_un.d_sdt->sdt_sods)
-#define LD_BUCKETS(x)	((x)->d_un.d_sdt->sdt_buckets)
-
-#define LD_GOTSZ(x)	((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got)
-#define LD_RELSZ(x)	((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel)
-#define LD_HASHSZ(x)	((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash)
-#define LD_STABSZ(x)	((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist)
-#define LD_PLTSZ(x)	((x)->d_un.d_sdt->sdt_plt_sz)
-#define LD_STRSZ(x)	((x)->d_un.d_sdt->sdt_str_sz)
-#define LD_TEXTSZ(x)	((x)->d_un.d_sdt->sdt_text_sz)
-
-/*
- * Interface to ld.so
- */
-struct crt_ldso {
-	int		crt_ba;		/* Base address of ld.so */
-	int		crt_dzfd;	/* "/dev/zero" file decriptor (SunOS) */
-	int		crt_ldfd;	/* ld.so file descriptor */
-	struct _dynamic	*crt_dp;	/* Main's __DYNAMIC */
-	char		**crt_ep;	/* environment strings */
-	caddr_t		crt_bp;		/* Breakpoint if run from debugger */
-	char		*crt_prog;	/* Program name (v3) */
-	char		*crt_ldso;	/* Link editor name (v4) */
-	struct ld_entry	*crt_ldentry;	/* dl*() access (v4) */
-};
-
-/*
- * Version passed from crt0 to ld.so (1st argument to _rtld()).
- */
-#define CRT_VERSION_SUN		1
-#define CRT_VERSION_BSD_2	2
-#define CRT_VERSION_BSD_3	3
-#define CRT_VERSION_BSD_4	4
-
-
-/*
- * Maximum number of recognized shared object version numbers.
- */
-#define MAXDEWEY	8
-
-/*
- * Header of the hints file.
- */
-struct hints_header {
-	long		hh_magic;
-#define HH_MAGIC	011421044151
-	long		hh_version;	/* Interface version number */
-#define LD_HINTS_VERSION_1	1
-	long		hh_hashtab;	/* Location of hash table */
-	long		hh_nbucket;	/* Number of buckets in hashtab */
-	long		hh_strtab;	/* Location of strings */
-	long		hh_strtab_sz;	/* Size of strings */
-	long		hh_ehints;	/* End of hints (max offset in file) */
-};
-
-#define HH_BADMAG(hdr)	((hdr).hh_magic != HH_MAGIC)
-
-/*
- * Hash table element in hints file.
- */
-struct hints_bucket {
-	/* namex and pathx are indices into the string table */
-	int		hi_namex;		/* Library name */
-	int		hi_pathx;		/* Full path */
-	int		hi_dewey[MAXDEWEY];	/* The versions */
-	int		hi_ndewey;		/* Number of version numbers */
-#define hi_major hi_dewey[0]
-#define hi_minor hi_dewey[1]
-	int		hi_next;		/* Next in this bucket */
-};
-
-#define _PATH_LD_HINTS		"/var/run/ld.so.hints"
-
-#endif /* _LINK_H_ */
-
diff --git a/sys/sys/lkm.h b/sys/sys/lkm.h
index 1c04a2afc571..01fbff9f455a 100644
--- a/sys/sys/lkm.h
+++ b/sys/sys/lkm.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: lkm.h,v 1.3 1994/09/27 20:39:48 phk Exp $
+ * lkm.h,v 1.5 1995/04/20 05:08:51 wpaul Exp
  */
 
 #ifndef _SYS_LKM_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 09b2b68af90d..0c6308bd4e21 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $Id: lockf.h,v 1.1 1994/08/08 17:30:58 davidg Exp $
+ * lockf.h,v 1.2 1994/08/21 04:41:50 paul Exp
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index e7c96f262e0b..14474ecd26a1 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.3 (Berkeley) 1/12/94
- * $Id: malloc.h,v 1.7 1995/03/12 13:25:01 ugen Exp $
+ * malloc.h,v 1.8 1995/04/20 03:18:15 julian Exp
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 3f888a626135..4573339c39d3 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.3 (Berkeley) 1/21/94
- * $Id: mbuf.h,v 1.8 1994/11/04 00:28:38 davidg Exp $
+ * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index a3d4c47a97a1..f58cb6c54bfb 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.1 (Berkeley) 6/2/93
- * $Id: mman.h,v 1.6 1995/03/25 17:28:30 davidg Exp $
+ * mman.h,v 1.7 1995/05/14 19:19:07 nate Exp
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 1e6b19a849f0..4a3d883a96f3 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- *	$Id: mount.h,v 1.18 1995/05/21 21:39:24 davidg Exp $
+ *	mount.h,v 1.19 1995/05/30 08:14:28 rgrimes Exp
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 48e7c5bd21ee..e16e8788282d 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $Id: msg.h,v 1.2 1994/09/17 13:24:27 davidg Exp $ */
+/* msg.h,v 1.3 1995/03/28 07:57:34 bde Exp */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 5d5c56a3df94..0cc01357966e 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $Id: msgbuf.h,v 1.4 1994/08/21 04:41:54 paul Exp $
+ * msgbuf.h,v 1.5 1995/03/16 18:16:21 bde Exp
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 8dbdd8b1f4e1..b78b1ab74ba8 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $Id: mtio.h,v 1.4 1994/10/28 13:19:42 jkh Exp $
+ * mtio.h,v 1.5 1995/03/21 11:21:37 dufault Exp
  */
 
 #ifndef _SYS_MTIO_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 3474c018152e..7f0929acef4c 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.2 (Berkeley) 1/4/94
- * $Id: namei.h,v 1.4 1995/03/06 06:45:47 phk Exp $
+ * namei.h,v 1.5 1995/03/09 20:27:21 phk Exp
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
deleted file mode 100644
index b80c0b21f717..000000000000
--- a/sys/sys/nlist_aout.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, 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.
- *
- *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
- *
- *	$Id$
- */
-
-#ifndef _NLIST_H_
-#define	_NLIST_H_
-
-/*
- * Symbol table entry format.  The #ifdef's are so that programs including
- * nlist.h can initialize nlist structures statically.
- */
-struct nlist {
-#ifdef _AOUT_INCLUDE_
-	union {
-		char *n_name;	/* symbol name (in memory) */
-		long n_strx;	/* file string table offset (on disk) */
-	} n_un;
-#else
-	char *n_name;		/* symbol name (in memory) */
-#endif
-
-#define	N_UNDF	0x00		/* undefined */
-#define	N_ABS	0x02		/* absolute address */
-#define	N_TEXT	0x04		/* text segment */
-#define	N_DATA	0x06		/* data segment */
-#define	N_BSS	0x08		/* bss segment */
-#define	N_INDR	0x0a		/* alias definition */
-#define	N_SIZE	0x0c		/* pseudo type, defines a symbol's size */
-#define	N_COMM	0x12		/* common reference */
-#define	N_FN	0x1e		/* file name (N_EXT on) */
-#define	N_WARN	0x1e		/* warning message (N_EXT off) */
-
-#define	N_EXT	0x01		/* external (global) bit, OR'ed in */
-#define	N_TYPE	0x1e		/* mask for all the type bits */
-	unsigned char n_type;	/* type defines */
-
-	char n_other;		/* spare */
-#define	n_hash	n_desc		/* used internally by ld(1); XXX */
-	short n_desc;		/* used by stab entries */
-	unsigned long n_value;	/* address/value of the symbol */
-};
-
-#define	N_FORMAT	"%08x"	/* namelist value format; XXX */
-#define	N_STAB		0x0e0	/* mask for debugger symbols -- stab(5) */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int nlist __P((const char *, struct nlist *));
-__END_DECLS
-
-#endif /* !_NLIST_H_ */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 09cb1ce9ccd9..246c1c7c275f 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
- * $Id: param.h,v 1.7 1995/02/07 03:33:05 davidg Exp $
+ * param.h,v 1.8 1995/05/14 03:00:05 davidg Exp
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 9097d0b3c003..21e06c286b6e 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.8 (Berkeley) 1/21/94
- * $Id: proc.h,v 1.16 1995/02/21 00:37:31 davidg Exp $
+ * proc.h,v 1.17 1995/03/16 18:16:22 bde Exp
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index f01f91013c99..e49f8ae162ae 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $Id: protosw.h,v 1.5 1994/10/08 22:22:57 phk Exp $
+ * protosw.h,v 1.6 1995/02/07 02:01:57 wollman Exp
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 9c6c15945a9b..cc23b886064e 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $Id: ptrace.h,v 1.3 1994/08/08 13:00:27 davidg Exp $
+ * ptrace.h,v 1.4 1995/03/16 18:16:23 bde Exp
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 0c53c003fa22..012aef62d433 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.4 (Berkeley) 1/4/94
- * $Id: queue.h,v 1.2 1994/08/02 07:53:25 davidg Exp $
+ * queue.h,v 1.3 1995/05/30 08:14:30 rgrimes Exp
  */
 
 #ifndef	_SYS_QUEUE_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 29f2ce0ef84d..75613de9b6dd 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93
- * $Id: reboot.h,v 1.9 1995/01/25 20:05:03 bde Exp $
+ * reboot.h,v 1.10 1995/04/20 06:06:42 phk Exp
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 432667ac58c1..22578e3f9fd9 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.2 (Berkeley) 1/4/94
- * $Id: resource.h,v 1.2 1994/08/02 07:53:28 davidg Exp $
+ * resource.h,v 1.3 1995/01/21 14:58:25 bde Exp
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index f03d3085dee5..a04599cde601 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.3 (Berkeley) 2/22/94
- * $Id: resourcevar.h,v 1.5 1994/10/10 00:58:33 phk Exp $
+ * resourcevar.h,v 1.6 1994/11/14 14:09:38 bde Exp
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rlist.h b/sys/sys/rlist.h
index 4c85b717b592..da3b2586b34d 100644
--- a/sys/sys/rlist.h
+++ b/sys/sys/rlist.h
@@ -16,7 +16,7 @@
  *		rlist_alloc(&swapmap, 100, &loc); obtain 100 sectors from swap
  *
  *	from: unknown?
- *	$Id: rlist.h,v 1.6 1993/11/25 01:38:01 wollman Exp $
+ *	rlist.h,v 1.7 1994/10/09 07:35:10 davidg Exp
  */
 
 #ifndef _SYS_RLIST_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 9a22a34806b7..0ef378009e06 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtprio.h,v 1.1 1994/09/01 05:12:53 davidg Exp $
+ *	rtprio.h,v 1.2 1994/10/02 04:45:59 davidg Exp
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h
index de461663a516..a96d9ce9b95a 100644
--- a/sys/sys/scsiio.h
+++ b/sys/sys/scsiio.h
@@ -1,5 +1,5 @@
 /*
- * $Id: scsiio.h,v 1.3 1995/01/08 13:39:46 dufault Exp $
+ * scsiio.h,v 1.4 1995/04/28 19:26:02 dufault Exp
  */
 #ifndef _SYS_SCSIIO_H_
 #define _SYS_SCSIIO_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index e69971e3b684..8f699efd3b61 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * select.h,v 1.2 1994/08/02 07:53:31 davidg Exp
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index ef08f4e25ed2..1922e9e140b9 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $Id: sem.h,v 1.2 1994/09/17 13:24:28 davidg Exp $ */
+/* sem.h,v 1.3 1995/03/28 07:57:35 bde Exp */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 710ad4475dca..52ea50bc18b1 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $Id: shm.h,v 1.2 1994/09/17 13:24:29 davidg Exp $ */
+/* shm.h,v 1.3 1994/10/02 17:24:54 phk Exp */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index c26054b094a9..e5fdf72b5d78 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.2 (Berkeley) 1/21/94
- * $Id: signal.h,v 1.2 1994/08/02 07:53:32 davidg Exp $
+ * signal.h,v 1.3 1995/01/29 01:19:25 ats Exp
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 9495c5f32100..e603d92f86d1 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.3 (Berkeley) 1/4/94
- * $Id: signalvar.h,v 1.4 1994/10/02 17:24:55 phk Exp $
+ * signalvar.h,v 1.5 1995/03/16 18:16:24 bde Exp
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 05f3fb2abbc8..9325643ce425 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id: socket.h,v 1.5 1995/01/05 19:51:51 se Exp $
+ * socket.h,v 1.6 1995/02/07 02:01:57 wollman Exp
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 9ac9dfaa03e8..57fff3c562d5 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.1 (Berkeley) 6/2/93
- * $Id: socketvar.h,v 1.5 1994/10/02 17:24:57 phk Exp $
+ * socketvar.h,v 1.6 1995/05/30 08:14:33 rgrimes Exp
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 41fc86b15aac..5b4aaddd0559 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id: sockio.h,v 1.4 1994/09/06 22:42:31 wollman Exp $
+ * sockio.h,v 1.5 1994/12/21 22:57:05 wollman Exp
  */
 
 #ifndef	_SYS_SOCKIO_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 99ae6b9792dc..ac3669459038 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.6 (Berkeley) 3/8/94
- * $Id: stat.h,v 1.5 1994/10/02 17:24:57 phk Exp $
+ * stat.h,v 1.6 1995/05/30 08:14:35 rgrimes Exp
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index 920bfd863561..9971a036597c 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,7 +2,7 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: syscalls.master,v 1.14 1995/03/25 16:52:11 davidg Exp $
+ * created from	syscall-hide.h,v 1.13 1995/04/23 12:22:03 ache Exp
  */
 
 HIDE_POSIX(fork)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 16159793bf90..0795160fd433 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: syscalls.master,v 1.14 1995/03/25 16:52:11 davidg Exp $
+ * created from	syscall.h,v 1.19 1995/04/23 12:22:06 ache Exp
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 2c61798a049d..dccb9f7cbf2d 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id: sysctl.h,v 1.22 1995/05/12 19:17:25 wollman Exp $
+ * sysctl.h,v 1.23 1995/05/30 08:14:36 rgrimes Exp
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index f2953a6fc1f3..49749610ae56 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysent.h,v 1.3 1995/02/14 19:23:20 sos Exp $
+ *	sysent.h,v 1.4 1995/03/16 18:16:29 bde Exp
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 2dc7a5bc3451..1be7b0f1d8d7 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id: syslimits.h,v 1.5 1994/08/21 04:41:59 paul Exp $
+ * syslimits.h,v 1.6 1994/12/03 17:36:37 smace Exp
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index 969717b6dd31..adaf6be72832 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id: syslog.h,v 1.3 1994/08/18 22:35:46 wollman Exp $
+ * syslog.h,v 1.4 1994/08/21 04:42:00 paul Exp
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 54a3d441e719..9c0ec696a87b 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.4 (Berkeley) 2/23/94
- * $Id: systm.h,v 1.21 1995/05/14 03:00:06 davidg Exp $
+ * systm.h,v 1.22 1995/05/30 08:14:38 rgrimes Exp
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
index f9aefc0cac97..474631d77ef2 100644
--- a/sys/sys/tablet.h
+++ b/sys/sys/tablet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tablet.h	8.3 (Berkeley) 1/4/94
- * $Id$
+ * tablet.h,v 1.2 1994/08/02 07:53:45 davidg Exp
  */
 
 #ifndef _SYS_TABLET_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 14b264850604..daaf0d1299df 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $Id: termios.h,v 1.5 1995/05/11 07:52:47 bde Exp $
+ * termios.h,v 1.6 1995/05/30 08:14:40 rgrimes Exp
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/time.h b/sys/sys/time.h
index fa7aecc935b8..ee7756aa4496 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.1 (Berkeley) 6/2/93
- * $Id: time.h,v 1.4 1994/10/02 17:25:01 phk Exp $
+ * time.h,v 1.5 1994/10/10 00:58:36 phk Exp
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 8759a7ca4f8d..3ecec8db5fe1 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $Id: timeb.h,v 1.2 1994/08/02 07:53:49 davidg Exp $
+ * timeb.h,v 1.3 1994/08/21 04:42:02 paul Exp
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/times.h b/sys/sys/times.h
index 961ebfd18264..cbb73dfde363 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * times.h,v 1.2 1994/08/02 07:53:50 davidg Exp
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 5ef2934ced7b..10d8f4c555f0 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
- * $Id: tprintf.h,v 1.2 1994/08/02 07:53:51 davidg Exp $
+ * tprintf.h,v 1.3 1994/08/21 04:42:03 paul Exp
  */
 
 #ifndef _SYS_TPRINTF_H_
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index f6cf61104b03..d040170dd0d8 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $Id: tty.h,v 1.17 1995/04/11 17:53:14 ache Exp $
+ * tty.h,v 1.18 1995/04/15 20:59:28 bde Exp
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 7146f600c714..aa2eb8d6da7d 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $Id: ttychars.h,v 1.3 1994/08/21 04:42:06 paul Exp $
+ * ttychars.h,v 1.4 1994/08/22 19:34:03 csgr Exp
  */
 
 #ifndef _SYS_TTYCHARS_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index 75c8619f3c08..17022450bb4d 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $Id: ttycom.h,v 1.8 1995/03/30 05:17:50 ache Exp $
+ * ttycom.h,v 1.9 1995/05/30 08:14:42 rgrimes Exp
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index 43216c7f58ad..8a3546e9337e 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id: ttydefaults.h,v 1.8 1995/05/11 07:52:48 bde Exp $
+ * ttydefaults.h,v 1.9 1995/05/30 08:14:47 rgrimes Exp
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index 5f41b471d6c2..a89db68bb708 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $Id: ttydev.h,v 1.2 1994/08/02 07:53:58 davidg Exp $
+ * ttydev.h,v 1.3 1994/08/26 12:07:31 jkh Exp
  */
 
 /* COMPATABILITY HEADER FILE */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 1a4e48b97db2..844162db4896 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.4 (Berkeley) 1/21/94
- * $Id: types.h,v 1.3 1994/09/16 11:44:45 paul Exp $
+ * types.h,v 1.4 1994/09/25 15:56:25 davidg Exp
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 33d64c036d52..e3e6a036d86f 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.2 (Berkeley) 1/4/94
- * $Id: ucred.h,v 1.4 1994/10/08 22:23:00 phk Exp $
+ * ucred.h,v 1.5 1995/04/23 08:31:02 bde Exp
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index d48c0343a267..ec64ff33df4b 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $Id: uio.h,v 1.3 1994/09/15 20:24:28 bde Exp $
+ * uio.h,v 1.4 1995/04/04 17:01:49 davidg Exp
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/un.h b/sys/sys/un.h
index b85714b97346..f1c7ec8e4cb8 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.1 (Berkeley) 6/2/93
- * $Id: un.h,v 1.5 1994/10/02 17:25:03 phk Exp $
+ * un.h,v 1.6 1995/05/30 08:14:48 rgrimes Exp
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 1f63f61e89ee..9f3cd4fd8d52 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $Id: unistd.h,v 1.2 1994/08/02 07:54:04 davidg Exp $
+ * unistd.h,v 1.4 1995/05/11 07:52:49 bde Exp
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 41d8cfc09b7c..6e0e8602c2ac 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $Id: unpcb.h,v 1.2 1994/08/02 07:54:05 davidg Exp $
+ * unpcb.h,v 1.3 1994/08/21 04:42:09 paul Exp
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 08e74dc79ea1..0ac8756b2974 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $Id: user.h,v 1.3 1994/08/21 04:42:10 paul Exp $
+ * user.h,v 1.4 1995/05/30 08:14:50 rgrimes Exp
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 0387cc1d206e..dc0586e18244 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $Id$
+ * utsname.h,v 1.3 1994/08/02 07:54:07 davidg Exp
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index e8ed7235f520..d95cbfe77c73 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vadvise.h	8.1 (Berkeley) 6/2/93
- * $Id: vadvise.h,v 1.2 1994/08/02 07:54:08 davidg Exp $
+ * vadvise.h,v 1.3 1994/08/21 04:42:11 paul Exp
  */
 
 #ifndef _SYS_VADVISE_H_
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index 4d59e36dd241..566b29f0f086 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vcmd.h	8.1 (Berkeley) 6/2/93
- * $Id: vcmd.h,v 1.2 1994/08/02 07:54:09 davidg Exp $
+ * vcmd.h,v 1.3 1994/08/21 04:42:12 paul Exp
  */
 
 #ifndef _SYS_VCMD_H_
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index b1a1fe330e2c..eaa63b520402 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vlimit.h	8.1 (Berkeley) 6/2/93
- * $Id: vlimit.h,v 1.3 1994/08/21 04:42:13 paul Exp $
+ * vlimit.h,v 1.4 1995/05/30 08:14:51 rgrimes Exp
  */
 
 #ifndef _SYS_VLIMIT_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 58992304f4c6..79a15e7e3bc1 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.1 (Berkeley) 6/2/93
- * $Id: vmmeter.h,v 1.9 1995/03/25 06:09:28 davidg Exp $
+ * vmmeter.h,v 1.10 1995/03/25 08:42:04 davidg Exp
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index a56e09e8e7db..068d2439ae86 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.19 1995/04/09 06:03:33 davidg Exp $
+ * vnode.h,v 1.20 1995/04/20 03:18:19 julian Exp
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index b867b8b42ced..809f575b9336 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vsio.h	8.1 (Berkeley) 6/2/93
- * $Id: vsio.h,v 1.3 1994/08/21 04:42:16 paul Exp $
+ * vsio.h,v 1.4 1995/05/30 08:14:52 rgrimes Exp
  */
 
 #ifndef _SYS_VSIO_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 0b8ec48970b1..7ec955e2886f 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.1 (Berkeley) 6/2/93
- * $Id: wait.h,v 1.3 1994/08/21 04:42:17 paul Exp $
+ * wait.h,v 1.4 1995/05/30 08:14:54 rgrimes Exp
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index d91c557616f9..4e77e7439ffd 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $Id: ffs_alloc.c,v 1.13 1995/05/11 19:26:48 rgrimes Exp $
+ * ffs_alloc.c,v 1.14 1995/05/30 08:14:57 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index cbe9c6051c84..e3c26d10037b 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
- * $Id: ffs_balloc.c,v 1.8 1995/05/28 04:32:23 davidg Exp $
+ * ffs_balloc.c,v 1.9 1995/05/30 08:14:59 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 43e7bbefaf4f..2d95130a2cdd 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $Id: ffs_extern.h,v 1.5 1994/09/22 19:38:32 wollman Exp $
+ * ffs_extern.h,v 1.6 1995/03/28 07:57:46 bde Exp
  */
 
 struct buf;
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 0bb88a96dff5..7a31d841da33 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.5 (Berkeley) 12/30/93
- * $Id: ffs_inode.c,v 1.12 1995/03/04 03:24:42 davidg Exp $
+ * ffs_inode.c,v 1.13 1995/03/26 23:29:10 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index cbf96521b7a1..9896a5e3a174 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
- * $Id: ffs_subr.c,v 1.3 1994/10/10 01:04:38 phk Exp $
+ * ffs_subr.c,v 1.4 1995/05/30 08:15:00 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index 089334ff6e4b..1c7080c04de8 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_tables.c	8.1 (Berkeley) 6/11/93
- * $Id: ffs_tables.c,v 1.2 1994/08/02 07:54:22 davidg Exp $
+ * ffs_tables.c,v 1.3 1995/05/30 08:15:02 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 662211340f29..b333c3783607 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $Id: ffs_vfsops.c,v 1.20 1995/05/19 03:26:56 davidg Exp $
+ * ffs_vfsops.c,v 1.21 1995/05/30 08:15:03 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index c5209fc2609e..54a8ba20f477 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.7 (Berkeley) 2/3/94
- * $Id: ffs_vnops.c,v 1.10 1995/05/21 21:39:26 davidg Exp $
+ * ffs_vnops.c,v 1.11 1995/05/30 08:15:05 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 41f204cb6f38..3734d0547a21 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $Id: fs.h,v 1.4 1995/03/10 22:18:16 davidg Exp $
+ * fs.h,v 1.5 1995/05/30 08:15:07 rgrimes Exp
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 1ae1e23ef919..d95c3c04bc47 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs.h	8.3 (Berkeley) 9/23/93
- * $Id: lfs.h,v 1.5 1994/11/17 01:30:47 gibbs Exp $
+ * lfs.h,v 1.6 1995/05/30 08:15:11 rgrimes Exp
  */
 
 #ifndef _UFS_LFS_LFS_H_
diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c
index fb60c3dfc954..6addeb5dfc34 100644
--- a/sys/ufs/lfs/lfs_alloc.c
+++ b/sys/ufs/lfs/lfs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_alloc.c	8.4 (Berkeley) 1/4/94
- * $Id: lfs_alloc.c,v 1.7 1995/03/28 07:58:02 bde Exp $
+ * lfs_alloc.c,v 1.8 1995/04/16 11:25:47 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c
index 81fac0d5db7e..311f88d9ee36 100644
--- a/sys/ufs/lfs/lfs_balloc.c
+++ b/sys/ufs/lfs/lfs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_balloc.c	8.1 (Berkeley) 6/11/93
- * $Id: lfs_balloc.c,v 1.6 1995/04/09 06:03:41 davidg Exp $
+ * lfs_balloc.c,v 1.7 1995/05/30 08:15:12 rgrimes Exp
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c
index 9344dbb590f5..680584e9bba6 100644
--- a/sys/ufs/lfs/lfs_bio.c
+++ b/sys/ufs/lfs/lfs_bio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_bio.c	8.4 (Berkeley) 12/30/93
- * $Id: lfs_bio.c,v 1.4 1994/08/20 03:49:01 davidg Exp $
+ * lfs_bio.c,v 1.5 1994/10/10 01:04:49 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c
index b3f689c95dbd..b6cabbd044a9 100644
--- a/sys/ufs/lfs/lfs_cksum.c
+++ b/sys/ufs/lfs/lfs_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_cksum.c	8.1 (Berkeley) 6/11/93
- * $Id: lfs_cksum.c,v 1.2 1994/08/02 07:54:32 davidg Exp $
+ * lfs_cksum.c,v 1.3 1995/05/30 08:15:14 rgrimes Exp
  */
 
 #include <sys/types.h>
diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c
index 1edffbf150f3..83056a9e1f2d 100644
--- a/sys/ufs/lfs/lfs_debug.c
+++ b/sys/ufs/lfs/lfs_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_debug.c	8.1 (Berkeley) 6/11/93
- * $Id: lfs_debug.c,v 1.2 1994/08/02 07:54:33 davidg Exp $
+ * lfs_debug.c,v 1.3 1995/05/30 08:15:16 rgrimes Exp
  */
 
 #ifdef DEBUG
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 9a1fb4ab0f04..16472c95f2c1 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id: lfs_extern.h,v 1.4 1994/09/22 19:38:34 wollman Exp $
+ * lfs_extern.h,v 1.5 1995/03/28 07:58:04 bde Exp
  */
 
 #ifndef _UFS_LFS_LFS_EXTERN_H_
diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c
index 61437c51d526..eb4fd1db7767 100644
--- a/sys/ufs/lfs/lfs_inode.c
+++ b/sys/ufs/lfs/lfs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_inode.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_inode.c,v 1.8 1995/03/26 23:29:13 davidg Exp $
+ * lfs_inode.c,v 1.9 1995/05/30 08:15:20 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 48a73ce6cbe1..c67435ef3742 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
- * $Id: lfs_segment.c,v 1.10 1995/05/11 19:26:51 rgrimes Exp $
+ * lfs_segment.c,v 1.11 1995/05/30 08:15:22 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c
index f911c3fc93a5..e2ff11706ecf 100644
--- a/sys/ufs/lfs/lfs_subr.c
+++ b/sys/ufs/lfs/lfs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_subr.c	8.2 (Berkeley) 9/21/93
- * $Id: lfs_subr.c,v 1.6 1995/01/09 16:05:23 davidg Exp $
+ * lfs_subr.c,v 1.7 1995/05/30 08:15:24 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index 1ec0cdc71279..730c5cbe96a2 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.5 (Berkeley) 4/20/94
- * $Id: lfs_syscalls.c,v 1.9 1995/05/11 19:26:52 rgrimes Exp $
+ * lfs_syscalls.c,v 1.10 1995/05/30 08:15:25 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index e571dcd628af..78525038e321 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vfsops.c	8.7 (Berkeley) 4/16/94
- * $Id: lfs_vfsops.c,v 1.10 1995/03/16 18:16:48 bde Exp $
+ * lfs_vfsops.c,v 1.11 1995/03/19 14:29:20 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 3d269532133e..407500a80d85 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_vnops.c,v 1.8 1995/04/09 06:03:42 davidg Exp $
+ * lfs_vnops.c,v 1.9 1995/05/30 08:15:27 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h
index fa51177ac9fe..408a6909da94 100644
--- a/sys/ufs/mfs/mfs_extern.h
+++ b/sys/ufs/mfs/mfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_extern.h	8.1 (Berkeley) 6/11/93
- * $Id: mfs_extern.h,v 1.2 1994/08/02 07:54:42 davidg Exp $
+ * mfs_extern.h,v 1.3 1994/08/21 07:16:10 paul Exp
  */
 
 #ifndef _UFS_MFS_MFS_EXTERN_H_
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index e491fe12a896..37d0c91fda61 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.4 (Berkeley) 4/16/94
- * $Id: mfs_vfsops.c,v 1.8 1995/05/19 03:27:01 davidg Exp $
+ * mfs_vfsops.c,v 1.9 1995/05/29 03:27:37 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index d0f6a644f180..cbd204e43eef 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.3 (Berkeley) 9/21/93
- * $Id: mfs_vnops.c,v 1.9 1995/03/19 14:29:22 davidg Exp $
+ * mfs_vnops.c,v 1.10 1995/05/11 19:26:53 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfsiom.h b/sys/ufs/mfs/mfsiom.h
index a420aa3210c4..c6a224bae7b9 100644
--- a/sys/ufs/mfs/mfsiom.h
+++ b/sys/ufs/mfs/mfsiom.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsiom.h	8.1 (Berkeley) 6/11/93
- * $Id: mfsiom.h,v 1.2 1994/08/02 07:54:45 davidg Exp $
+ * mfsiom.h,v 1.3 1994/08/21 07:16:11 paul Exp
  */
 
 #ifndef _UFS_MFS_MFSIOM_H_
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index 28d9254265cf..42c6ab3d898f 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.2 (Berkeley) 8/11/93
- * $Id: mfsnode.h,v 1.2 1994/08/02 07:54:46 davidg Exp $
+ * mfsnode.h,v 1.3 1994/08/21 07:16:12 paul Exp
  */
 
 #ifndef _UFS_MFS_MFSNODE_H_
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index b91843b7a79e..3c3e70bc936a 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $Id: dinode.h,v 1.2 1994/08/02 07:54:47 davidg Exp $
+ * dinode.h,v 1.3 1994/08/21 07:16:13 paul Exp
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index f18eca8dc8aa..5996471f2e09 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $Id: dir.h,v 1.2 1994/08/02 07:54:48 davidg Exp $
+ * dir.h,v 1.3 1994/08/21 07:16:14 paul Exp
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 00105ea3635d..b52f5d3ae871 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $
+ * inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 35dafa934cf3..c48ef202e975 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.1 (Berkeley) 6/11/93
- * $Id: quota.h,v 1.2 1994/08/02 07:54:51 davidg Exp $
+ * quota.h,v 1.3 1994/08/21 07:16:16 paul Exp
  */
 
 #ifndef _UFS_UFS_QUOTA_
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 900d2c24a709..9f00b4437e06 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.6 (Berkeley) 1/21/94
- * $Id: ufs_bmap.c,v 1.7 1995/03/28 07:58:16 bde Exp $
+ * ufs_bmap.c,v 1.8 1995/05/30 08:15:31 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 958f5946e88b..a1e311d12f57 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.14 1995/03/18 07:06:51 davidg Exp $
+ * ufs_disksubr.c,v 1.15 1995/05/30 08:15:33 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 8ff0d949d505..29a2ebfabb82 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.3 (Berkeley) 4/16/94
- * $Id: ufs_extern.h,v 1.6 1994/11/14 13:50:15 bde Exp $
+ * ufs_extern.h,v 1.7 1995/03/28 07:58:17 bde Exp
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 18ac11c40622..beb93daf1673 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.4 (Berkeley) 12/30/93
- * $Id: ufs_ihash.c,v 1.4 1994/10/08 06:57:23 phk Exp $
+ * ufs_ihash.c,v 1.5 1995/04/24 05:13:13 dyson Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index c3e4c51e4f29..d77eaac8a636 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_inode.c	8.4 (Berkeley) 1/21/94
- * $Id: ufs_inode.c,v 1.5 1994/10/15 04:08:44 ache Exp $
+ * ufs_inode.c,v 1.6 1995/01/04 23:48:04 gibbs Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index b8de08b3de15..7088f2241e55 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
- * $Id: ufs_lookup.c,v 1.2 1994/08/02 07:54:58 davidg Exp $
+ * ufs_lookup.c,v 1.3 1994/10/08 06:57:26 phk Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 9b1f6218d337..3d6d0ff0c002 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.2 (Berkeley) 12/30/93
- * $Id: ufs_quota.c,v 1.4 1994/10/08 06:57:27 phk Exp $
+ * ufs_quota.c,v 1.5 1995/05/30 08:15:36 rgrimes Exp
  */
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index 5b273bedeb40..7e6717664cde 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.7 (Berkeley) 1/21/94
- * $Id: ufs_readwrite.c,v 1.8 1995/04/09 06:03:44 davidg Exp $
+ * ufs_readwrite.c,v 1.9 1995/04/24 05:13:15 dyson Exp
  */
 
 #ifdef LFS_READWRITE
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 950f386e1722..6f62df4ea3a5 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vfsops.c	8.4 (Berkeley) 4/16/94
- * $Id: ufs_vfsops.c,v 1.3 1994/10/08 06:57:28 phk Exp $
+ * ufs_vfsops.c,v 1.4 1995/03/10 22:06:39 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 48e52dda6ea0..c957bf158b1e 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.10 (Berkeley) 4/1/94
- * $Id: ufs_vnops.c,v 1.23 1995/05/15 07:31:09 davidg Exp $
+ * ufs_vnops.c,v 1.24 1995/05/30 08:15:39 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 02fdff2eb3fa..ae182e79d7ca 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
- * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $
+ * ufsmount.h,v 1.3 1994/08/21 07:16:18 paul Exp
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 8ce0bc164fc5..8a4371500cb2 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.10 1995/05/18 02:59:18 davidg Exp $
+ * device_pager.c,v 1.11 1995/05/30 08:15:46 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/device_pager.h b/sys/vm/device_pager.h
index 6fa8bfe6ac51..4d50581008dc 100644
--- a/sys/vm/device_pager.h
+++ b/sys/vm/device_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.h	8.3 (Berkeley) 12/13/93
- * $Id: device_pager.h,v 1.2 1994/08/02 07:55:07 davidg Exp $
+ * device_pager.h,v 1.3 1995/01/09 16:05:30 davidg Exp
  */
 
 #ifndef	_DEVICE_PAGER_
diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c
index 30be6763c188..b6605095eb65 100644
--- a/sys/vm/kern_lock.c
+++ b/sys/vm/kern_lock.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: kern_lock.c,v 1.5 1995/04/16 12:56:12 davidg Exp $
+ * kern_lock.c,v 1.6 1995/05/30 08:15:49 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/lock.h b/sys/vm/lock.h
index 6cd71edc2947..4eee01b08fcf 100644
--- a/sys/vm/lock.h
+++ b/sys/vm/lock.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: lock.h,v 1.2 1994/08/02 07:55:11 davidg Exp $
+ * lock.h,v 1.3 1995/01/09 16:05:31 davidg Exp
  */
 
 /*
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index b55519f2f20d..b7625e9927fd 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: pmap.h,v 1.5 1994/11/14 08:19:07 bde Exp $
+ * pmap.h,v 1.6 1995/01/09 16:05:32 davidg Exp
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 16ec7bba3cc8..a5b6a625d265 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.40 1995/05/18 02:59:20 davidg Exp $
+ * swap_pager.c,v 1.41 1995/05/30 08:15:55 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 5a1393f5e0e1..332cff30adc6 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.5 1995/02/02 09:08:09 davidg Exp $
+ *	swap_pager.h,v 1.6 1995/05/10 18:56:04 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index a24ba321a569..c8c473b1bad0 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id: vm.h,v 1.3 1994/08/02 07:55:16 davidg Exp $
+ * vm.h,v 1.4 1995/01/09 16:05:37 davidg Exp
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 997f41a0e21d..740f4be600c9 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.14 1995/05/10 18:56:04 davidg Exp $
+ * vm_extern.h,v 1.15 1995/05/14 03:00:09 davidg Exp
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index c061c3eb6f12..caf6cb4c291a 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,7 +66,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.24 1995/05/18 02:59:22 davidg Exp $
+ * vm_fault.c,v 1.25 1995/05/30 08:15:59 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 02b1b7015568..5bc82bd916d7 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.19 1995/04/16 12:56:15 davidg Exp $
+ * vm_glue.c,v 1.20 1995/05/30 08:16:01 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h
index ee212e19bdc5..fbb7200d7f6d 100644
--- a/sys/vm/vm_inherit.h
+++ b/sys/vm/vm_inherit.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_inherit.h,v 1.2 1994/08/02 07:55:20 davidg Exp $
+ * vm_inherit.h,v 1.3 1995/01/09 16:05:41 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 64f3814d2184..f30a5dd87140 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.5 1995/01/09 16:05:42 davidg Exp $
+ * vm_init.c,v 1.6 1995/03/16 18:17:11 bde Exp
  */
 
 /*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 07b4c49e7f76..6f3ec90c7cc4 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.12 1995/03/15 07:52:06 davidg Exp $
+ * vm_kern.c,v 1.13 1995/05/30 08:16:04 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 627c70d2a6f1..f42b439aa7e4 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.h,v 1.4 1994/08/18 22:36:03 wollman Exp $
+ * vm_kern.h,v 1.5 1995/01/09 16:05:44 davidg Exp
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index c87fe7725861..2617458d0ba3 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.21 1995/04/16 12:56:17 davidg Exp $
+ * vm_map.c,v 1.22 1995/05/30 08:16:07 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index f250144047d9..4420578c779d 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.h,v 1.4 1995/01/09 16:05:46 davidg Exp $
+ * vm_map.h,v 1.5 1995/03/16 18:17:17 bde Exp
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index bf65f8ca4ad8..5d862847334e 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $Id: vm_meter.c,v 1.5 1995/01/09 16:05:47 davidg Exp $
+ * vm_meter.c,v 1.6 1995/01/10 07:32:47 davidg Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 1f9c0415f34a..22b2dbea688f 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.23 1995/05/18 02:59:24 davidg Exp $
+ * vm_mmap.c,v 1.24 1995/05/30 08:16:09 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 07181c4599d4..efe741edd335 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.47 1995/05/30 08:16:12 rgrimes Exp $
+ * vm_object.c,v 1.47.2.1 1995/06/04 13:53:25 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 18b4e9ac4bff..8296fceaf988 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.h,v 1.17 1995/04/09 06:03:51 davidg Exp $
+ * vm_object.h,v 1.18 1995/05/02 05:57:11 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 30983e14bbb7..b796cfd417be 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.31 1995/04/16 12:56:21 davidg Exp $
+ *	vm_page.c,v 1.32 1995/05/30 08:16:15 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 4a4e54d87c9f..a9eed6c26918 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.17 1995/03/26 23:33:14 davidg Exp $
+ * vm_page.h,v 1.18 1995/04/23 08:05:49 bde Exp
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index c4c351fd38cf..8f813b3d24f7 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.50 1995/05/21 21:39:31 davidg Exp $
+ * vm_pageout.c,v 1.51 1995/05/30 08:16:18 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index d1da63c280ed..84a6588cf85b 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.h,v 1.11 1995/04/09 06:03:55 davidg Exp $
+ * vm_pageout.h,v 1.12 1995/05/30 08:16:20 rgrimes Exp
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index f7f1976d7b6b..053c8180fd25 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.14 1995/04/25 06:22:47 davidg Exp $
+ * vm_pager.c,v 1.15 1995/05/10 18:56:07 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 1cab34a5045b..8a94efdafe37 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id: vm_pager.h,v 1.6 1995/03/16 18:17:32 bde Exp $
+ * vm_pager.h,v 1.7 1995/05/10 18:56:08 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 4b047f9e06ca..6f9b3f1140ef 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_param.h,v 1.3 1994/08/02 07:55:37 davidg Exp $
+ * vm_param.h,v 1.4 1995/01/09 16:05:57 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index 36079a0c1ed9..83efa6523ff8 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_prot.h,v 1.3 1994/08/02 07:55:38 davidg Exp $
+ * vm_prot.h,v 1.4 1995/01/09 16:05:57 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 9b90074ddc8d..45f390754624 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.20 1995/05/25 03:38:11 davidg Exp $
+ * vm_swap.c,v 1.21 1995/05/30 08:16:21 rgrimes Exp
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index 51f50616880d..f778aff3842d 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
  *
  *	@(#)vm_unix.c	8.1 (Berkeley) 6/11/93
- * $Id: vm_unix.c,v 1.4 1995/01/09 16:05:59 davidg Exp $
+ * vm_unix.c,v 1.5 1995/02/20 17:36:36 davidg Exp
  */
 
 /*
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 6b93ec87ad88..fd50ebdcbd59 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.39 1995/05/18 02:59:26 davidg Exp $
+ *	vnode_pager.c,v 1.40 1995/05/30 08:16:23 rgrimes Exp
  */
 
 /*
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 381af99feb69..78e8e31fe4b8 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $Id: vnode_pager.h,v 1.3 1994/08/02 07:55:43 davidg Exp $
+ * vnode_pager.h,v 1.4 1995/01/09 16:06:02 davidg Exp
  */
 
 #ifndef	_VNODE_PAGER_