Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

134 files changed, 327 insertions, 863 deletions

diff --git a/sys/lib/libkern/adddi3.c b/sys/lib/libkern/adddi3.c
index 5486f8479bb..28e0218eea0 100644
--- a/sys/lib/libkern/adddi3.c
+++ b/sys/lib/libkern/adddi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adddi3.c,v 1.2 1997/11/07 15:56:33 niklas Exp $	*/
+/*	$OpenBSD: adddi3.c,v 1.3 2003/06/02 23:28:07 millert Exp $	*/
 /*	$NetBSD: adddi3.c,v 1.5 1995/10/07 09:26:14 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)adddi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: adddi3.c,v 1.2 1997/11/07 15:56:33 niklas Exp $";
+static char rcsid[] = "$OpenBSD: adddi3.c,v 1.3 2003/06/02 23:28:07 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/anddi3.c b/sys/lib/libkern/anddi3.c
index b49f9d8aec6..c614f479fa6 100644
--- a/sys/lib/libkern/anddi3.c
+++ b/sys/lib/libkern/anddi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: anddi3.c,v 1.2 1997/11/07 15:56:35 niklas Exp $	*/
+/*	$OpenBSD: anddi3.c,v 1.3 2003/06/02 23:28:07 millert Exp $	*/
 /*	$NetBSD: anddi3.c,v 1.5 1995/10/07 09:26:15 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)anddi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: anddi3.c,v 1.2 1997/11/07 15:56:35 niklas Exp $";
+static char rcsid[] = "$OpenBSD: anddi3.c,v 1.3 2003/06/02 23:28:07 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/arch/i386/SYS.h b/sys/lib/libkern/arch/i386/SYS.h
index 567d017fc96..e7c0823b75a 100644
--- a/sys/lib/libkern/arch/i386/SYS.h
+++ b/sys/lib/libkern/arch/i386/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.2 1996/09/27 06:47:44 mickey Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/i386/htonl.S b/sys/lib/libkern/arch/i386/htonl.S
index 9cdc2197efa..243efbe3b60 100644
--- a/sys/lib/libkern/arch/i386/htonl.S
+++ b/sys/lib/libkern/arch/i386/htonl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htonl.S,v 1.2 1996/09/27 06:47:45 mickey Exp $	*/
+/*	$OpenBSD: htonl.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/i386/htons.S b/sys/lib/libkern/arch/i386/htons.S
index f2639ec1e26..ecb6ae18f12 100644
--- a/sys/lib/libkern/arch/i386/htons.S
+++ b/sys/lib/libkern/arch/i386/htons.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htons.S,v 1.2 1996/09/27 06:47:46 mickey Exp $	*/
+/*	$OpenBSD: htons.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/i386/ntohl.S b/sys/lib/libkern/arch/i386/ntohl.S
index 2ab993d4b87..f4a069905aa 100644
--- a/sys/lib/libkern/arch/i386/ntohl.S
+++ b/sys/lib/libkern/arch/i386/ntohl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohl.S,v 1.2 1996/09/27 06:47:47 mickey Exp $	*/
+/*	$OpenBSD: ntohl.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/i386/ntohs.S b/sys/lib/libkern/arch/i386/ntohs.S
index c5786e33ac5..a18aa154ab7 100644
--- a/sys/lib/libkern/arch/i386/ntohs.S
+++ b/sys/lib/libkern/arch/i386/ntohs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohs.S,v 1.2 1996/09/27 06:47:47 mickey Exp $	*/
+/*	$OpenBSD: ntohs.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
@@ -36,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ntohs.s	5.2 (Berkeley) 12/17/90
- *	$Id: ntohs.S,v 1.2 1996/09/27 06:47:47 mickey Exp $
+ *	$Id: ntohs.S,v 1.3 2003/06/02 23:28:08 millert Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/lib/libkern/arch/i386/setjmp.S b/sys/lib/libkern/arch/i386/setjmp.S
index 2292460010c..4d8f6fa111e 100644
--- a/sys/lib/libkern/arch/i386/setjmp.S
+++ b/sys/lib/libkern/arch/i386/setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.S,v 1.2 1996/09/27 06:47:48 mickey Exp $	*/
+/*	$OpenBSD: setjmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: setjmp.S,v 1.5 1994/10/26 06:39:14 cgd Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/m68k/SYS.h b/sys/lib/libkern/arch/m68k/SYS.h
index d74877b8d95..53dcaa91d90 100644
--- a/sys/lib/libkern/arch/m68k/SYS.h
+++ b/sys/lib/libkern/arch/m68k/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.2 1997/11/07 15:57:00 niklas Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: SYS.h,v 1.2 1994/10/26 06:39:23 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/m68k/bcmp.S b/sys/lib/libkern/arch/m68k/bcmp.S
index 14d9b282e8e..4817edbc495 100644
--- a/sys/lib/libkern/arch/m68k/bcmp.S
+++ b/sys/lib/libkern/arch/m68k/bcmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcmp.S,v 1.2 1997/11/07 15:57:01 niklas Exp $	*/
+/*	$OpenBSD: bcmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)bcmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: bcmp.S,v 1.2 1997/11/07 15:57:01 niklas Exp $"
+	.asciz "$OpenBSD: bcmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* bcmp(s1, s2, n) */
diff --git a/sys/lib/libkern/arch/m68k/bzero.S b/sys/lib/libkern/arch/m68k/bzero.S
index ce8bdaa0163..c51b630e454 100644
--- a/sys/lib/libkern/arch/m68k/bzero.S
+++ b/sys/lib/libkern/arch/m68k/bzero.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bzero.S,v 1.2 1997/11/07 15:57:02 niklas Exp $	*/
+/*	$OpenBSD: bzero.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)bzero.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: bzero.S,v 1.2 1997/11/07 15:57:02 niklas Exp $"
+	.asciz "$OpenBSD: bzero.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/m68k/ffs.S b/sys/lib/libkern/arch/m68k/ffs.S
index 7a2476472e2..cd2e536e71b 100644
--- a/sys/lib/libkern/arch/m68k/ffs.S
+++ b/sys/lib/libkern/arch/m68k/ffs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.S,v 1.2 1997/11/07 15:57:03 niklas Exp $	*/
+/*	$OpenBSD: ffs.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)ffs.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: ffs.S,v 1.2 1997/11/07 15:57:03 niklas Exp $"
+	.asciz "$OpenBSD: ffs.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* bit = ffs(value) */
diff --git a/sys/lib/libkern/arch/m68k/htonl.S b/sys/lib/libkern/arch/m68k/htonl.S
index 926a5f470c2..9400cd6b08a 100644
--- a/sys/lib/libkern/arch/m68k/htonl.S
+++ b/sys/lib/libkern/arch/m68k/htonl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htonl.S,v 1.2 1997/11/07 15:57:04 niklas Exp $	*/
+/*	$OpenBSD: htonl.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: htonl.S,v 1.2 1994/10/26 06:39:27 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -43,7 +39,7 @@
 #ifdef notdef
 	.asciz "@(#)htonl.s	5.1 (Berkeley) 5/12/90"
 #endif
-	.asciz "$OpenBSD: htonl.S,v 1.2 1997/11/07 15:57:04 niklas Exp $"
+	.asciz "$OpenBSD: htonl.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* netorder = htonl(hostorder) */
diff --git a/sys/lib/libkern/arch/m68k/htons.S b/sys/lib/libkern/arch/m68k/htons.S
index da4e0c505a6..bc36d9fe707 100644
--- a/sys/lib/libkern/arch/m68k/htons.S
+++ b/sys/lib/libkern/arch/m68k/htons.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htons.S,v 1.2 1997/11/07 15:57:04 niklas Exp $	*/
+/*	$OpenBSD: htons.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: htons.S,v 1.2 1994/10/26 06:39:27 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -43,7 +39,7 @@
 #ifdef notdef
 	.asciz "@(#)htons.s	5.1 (Berkeley) 5/12/90"
 #endif
-	.asciz "$OpenBSD: htons.S,v 1.2 1997/11/07 15:57:04 niklas Exp $"
+	.asciz "$OpenBSD: htons.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* hostorder = htons(netorder) */
diff --git a/sys/lib/libkern/arch/m68k/locc.S b/sys/lib/libkern/arch/m68k/locc.S
index 681404193e3..49cdc375aa5 100644
--- a/sys/lib/libkern/arch/m68k/locc.S
+++ b/sys/lib/libkern/arch/m68k/locc.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locc.S,v 1.2 1997/11/07 15:57:05 niklas Exp $	*/
+/*	$OpenBSD: locc.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: locc.S,v 1.2 1994/10/26 06:39:28 cgd Exp $	*/
 
 /*
@@ -18,11 +18,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/m68k/memcmp.S b/sys/lib/libkern/arch/m68k/memcmp.S
index b0ebb297072..c11bc2b007f 100644
--- a/sys/lib/libkern/arch/m68k/memcmp.S
+++ b/sys/lib/libkern/arch/m68k/memcmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memcmp.S,v 1.1 2000/06/16 19:56:55 millert Exp $	*/
+/*	$OpenBSD: memcmp.S,v 1.2 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -41,7 +37,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: memcmp.S,v 1.1 2000/06/16 19:56:55 millert Exp $"
+	.asciz "$OpenBSD: memcmp.S,v 1.2 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /* memcmp(s1, s2, n) */
diff --git a/sys/lib/libkern/arch/m68k/memset.S b/sys/lib/libkern/arch/m68k/memset.S
index 45e258dff7a..47101c05452 100644
--- a/sys/lib/libkern/arch/m68k/memset.S
+++ b/sys/lib/libkern/arch/m68k/memset.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memset.S,v 1.1 2000/06/16 19:56:55 millert Exp $	*/
+/*	$OpenBSD: memset.S,v 1.2 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -41,7 +37,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: memset.S,v 1.1 2000/06/16 19:56:55 millert Exp $"
+	.asciz "$OpenBSD: memset.S,v 1.2 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /*
diff --git a/sys/lib/libkern/arch/m68k/ntohl.S b/sys/lib/libkern/arch/m68k/ntohl.S
index 20415157b1e..f9fd525abfb 100644
--- a/sys/lib/libkern/arch/m68k/ntohl.S
+++ b/sys/lib/libkern/arch/m68k/ntohl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohl.S,v 1.2 1997/11/07 15:57:05 niklas Exp $	*/
+/*	$OpenBSD: ntohl.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: ntohl.S,v 1.2 1994/10/26 06:39:29 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -43,7 +39,7 @@
 #ifdef notdef
 	.asciz "@(#)ntohl.s	5.1 (Berkeley) 5/12/90"
 #endif
-	.asciz "$OpenBSD: ntohl.S,v 1.2 1997/11/07 15:57:05 niklas Exp $"
+	.asciz "$OpenBSD: ntohl.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* hostorder = ntohl(netorder) */
diff --git a/sys/lib/libkern/arch/m68k/ntohs.S b/sys/lib/libkern/arch/m68k/ntohs.S
index b58a840eb24..c399ae54a94 100644
--- a/sys/lib/libkern/arch/m68k/ntohs.S
+++ b/sys/lib/libkern/arch/m68k/ntohs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohs.S,v 1.2 1997/11/07 15:57:06 niklas Exp $	*/
+/*	$OpenBSD: ntohs.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: ntohs.S,v 1.2 1994/10/26 06:39:30 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -43,7 +39,7 @@
 #ifdef notdef
 	.asciz "@(#)ntohs.s	5.1 (Berkeley) 5/12/90"
 #endif
-	.asciz "$OpenBSD: ntohs.S,v 1.2 1997/11/07 15:57:06 niklas Exp $"
+	.asciz "$OpenBSD: ntohs.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* hostorder = ntohs(netorder) */
diff --git a/sys/lib/libkern/arch/m68k/scanc.S b/sys/lib/libkern/arch/m68k/scanc.S
index d2b274a24b1..d315640318f 100644
--- a/sys/lib/libkern/arch/m68k/scanc.S
+++ b/sys/lib/libkern/arch/m68k/scanc.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scanc.S,v 1.2 1997/11/07 15:57:07 niklas Exp $	*/
+/*	$OpenBSD: scanc.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: scanc.S,v 1.2 1994/10/26 06:39:31 cgd Exp $	*/
 
 /*
@@ -18,11 +18,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/m68k/skpc.S b/sys/lib/libkern/arch/m68k/skpc.S
index 9677f8dace2..f5cea15ced1 100644
--- a/sys/lib/libkern/arch/m68k/skpc.S
+++ b/sys/lib/libkern/arch/m68k/skpc.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skpc.S,v 1.2 1997/11/07 15:57:08 niklas Exp $	*/
+/*	$OpenBSD: skpc.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: skpc.S,v 1.2 1994/10/26 06:39:32 cgd Exp $	*/
 
 /*
@@ -18,11 +18,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/m68k/strcat.S b/sys/lib/libkern/arch/m68k/strcat.S
index ec1188fb2c2..9efa50420f0 100644
--- a/sys/lib/libkern/arch/m68k/strcat.S
+++ b/sys/lib/libkern/arch/m68k/strcat.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcat.S,v 1.2 1997/11/07 15:57:08 niklas Exp $	*/
+/*	$OpenBSD: strcat.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: strcat.S,v 1.1 1996/04/18 01:53:06 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #if 0
 	RCSID("from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$OpenBSD: strcat.S,v 1.2 1997/11/07 15:57:08 niklas Exp $")
+	RCSID("$OpenBSD: strcat.S,v 1.3 2003/06/02 23:28:08 millert Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/arch/m68k/strcmp.S b/sys/lib/libkern/arch/m68k/strcmp.S
index fc0f273e990..ddb7dc847fa 100644
--- a/sys/lib/libkern/arch/m68k/strcmp.S
+++ b/sys/lib/libkern/arch/m68k/strcmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcmp.S,v 1.2 1997/11/07 15:57:09 niklas Exp $	*/
+/*	$OpenBSD: strcmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)strcmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: strcmp.S,v 1.2 1997/11/07 15:57:09 niklas Exp $"
+	.asciz "$OpenBSD: strcmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/m68k/strcpy.S b/sys/lib/libkern/arch/m68k/strcpy.S
index 4caa3f71087..beabba8ef01 100644
--- a/sys/lib/libkern/arch/m68k/strcpy.S
+++ b/sys/lib/libkern/arch/m68k/strcpy.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcpy.S,v 1.2 1997/11/07 15:57:10 niklas Exp $	*/
+/*	$OpenBSD: strcpy.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: strcpy.S,v 1.2 1997/11/07 15:57:10 niklas Exp $"
+	.asciz "$OpenBSD: strcpy.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/m68k/strlen.S b/sys/lib/libkern/arch/m68k/strlen.S
index 917b836d43b..5d96d711675 100644
--- a/sys/lib/libkern/arch/m68k/strlen.S
+++ b/sys/lib/libkern/arch/m68k/strlen.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlen.S,v 1.2 1997/11/07 15:57:11 niklas Exp $	*/
+/*	$OpenBSD: strlen.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)strlen.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: strlen.S,v 1.2 1997/11/07 15:57:11 niklas Exp $"
+	.asciz "$OpenBSD: strlen.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/m68k/strncmp.S b/sys/lib/libkern/arch/m68k/strncmp.S
index b193a9d93a3..eb11db25a65 100644
--- a/sys/lib/libkern/arch/m68k/strncmp.S
+++ b/sys/lib/libkern/arch/m68k/strncmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strncmp.S,v 1.2 1997/11/07 15:57:12 niklas Exp $	*/
+/*	$OpenBSD: strncmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)strncmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: strncmp.S,v 1.2 1997/11/07 15:57:12 niklas Exp $"
+	.asciz "$OpenBSD: strncmp.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/m68k/strncpy.S b/sys/lib/libkern/arch/m68k/strncpy.S
index b759a919e18..cf17a4a1aea 100644
--- a/sys/lib/libkern/arch/m68k/strncpy.S
+++ b/sys/lib/libkern/arch/m68k/strncpy.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strncpy.S,v 1.2 1997/11/07 15:57:13 niklas Exp $	*/
+/*	$OpenBSD: strncpy.S,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -40,7 +36,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
 	/*.asciz "from: @(#)strncpy.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: strncpy.S,v 1.2 1997/11/07 15:57:13 niklas Exp $"
+	.asciz "$OpenBSD: strncpy.S,v 1.3 2003/06/02 23:28:08 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/mips/SYS.h b/sys/lib/libkern/arch/mips/SYS.h
index 2c28f2fb9a9..50e667355e5 100644
--- a/sys/lib/libkern/arch/mips/SYS.h
+++ b/sys/lib/libkern/arch/mips/SYS.h
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: SYS.h,v 1.2 1997/11/07 15:57:15 niklas Exp $*/
+/* *	$OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:08 millert Exp $*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,11 +14,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/powerpc/memcpy.c b/sys/lib/libkern/arch/powerpc/memcpy.c
index f69a0a33435..f0c53b47de8 100644
--- a/sys/lib/libkern/arch/powerpc/memcpy.c
+++ b/sys/lib/libkern/arch/powerpc/memcpy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memcpy.c,v 1.1 1996/12/28 06:03:54 rahnds Exp $	*/
+/*	$OpenBSD: memcpy.c,v 1.2 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: bcopy.c,v 1.5 1995/04/22 13:46:50 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc/DEFS.h b/sys/lib/libkern/arch/sparc/DEFS.h
index f0b72ae3a87..823c770f999 100644
--- a/sys/lib/libkern/arch/sparc/DEFS.h
+++ b/sys/lib/libkern/arch/sparc/DEFS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: DEFS.h,v 1.2 1997/11/07 15:57:30 niklas Exp $	*/
+/*	$OpenBSD: DEFS.h,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: DEFS.h,v 1.2 1994/10/26 06:39:51 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc/SYS.h b/sys/lib/libkern/arch/sparc/SYS.h
index bd0344a6da6..c0b773edc81 100644
--- a/sys/lib/libkern/arch/sparc/SYS.h
+++ b/sys/lib/libkern/arch/sparc/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.2 1997/11/07 15:57:31 niklas Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: SYS.h,v 1.2 1994/10/26 06:39:53 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc/_setjmp.S b/sys/lib/libkern/arch/sparc/_setjmp.S
index c4b038019da..2efc117c740 100644
--- a/sys/lib/libkern/arch/sparc/_setjmp.S
+++ b/sys/lib/libkern/arch/sparc/_setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _setjmp.S,v 1.2 1997/11/07 15:57:32 niklas Exp $	*/
+/*	$OpenBSD: _setjmp.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: _setjmp.S,v 1.2 1994/10/26 06:39:54 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)_setjmp.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: _setjmp.S,v 1.2 1997/11/07 15:57:32 niklas Exp $"
+	.asciz "$OpenBSD: _setjmp.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/sys/lib/libkern/arch/sparc/bzero.S b/sys/lib/libkern/arch/sparc/bzero.S
index 0eb4cca1ac3..11d78e7a4bc 100644
--- a/sys/lib/libkern/arch/sparc/bzero.S
+++ b/sys/lib/libkern/arch/sparc/bzero.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bzero.S,v 1.2 1997/11/07 15:57:33 niklas Exp $	*/
+/*	$OpenBSD: bzero.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: bzero.S,v 1.2 1994/10/26 06:39:54 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)bzero.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: bzero.S,v 1.2 1997/11/07 15:57:33 niklas Exp $"
+	.asciz "$OpenBSD: bzero.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif  /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/sparc/divrem.m4 b/sys/lib/libkern/arch/sparc/divrem.m4
index 8f6480a63a7..1d19beab425 100644
--- a/sys/lib/libkern/arch/sparc/divrem.m4
+++ b/sys/lib/libkern/arch/sparc/divrem.m4
@@ -1,4 +1,4 @@
-/*	$OpenBSD: divrem.m4,v 1.5 2002/08/11 12:21:33 art Exp $	*/
+/*	$OpenBSD: divrem.m4,v 1.6 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: divrem.m4,v 1.3 1995/04/22 09:37:39 pk Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -49,7 +45,7 @@
 #ifdef notdef
 	.asciz "@(#)divrem.m4	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: divrem.m4,v 1.5 2002/08/11 12:21:33 art Exp $"
+	.asciz "$OpenBSD: divrem.m4,v 1.6 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/sys/lib/libkern/arch/sparc/ffs.S b/sys/lib/libkern/arch/sparc/ffs.S
index 78e8ada31b8..31fd6fe8c14 100644
--- a/sys/lib/libkern/arch/sparc/ffs.S
+++ b/sys/lib/libkern/arch/sparc/ffs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.S,v 1.2 1997/11/07 15:57:34 niklas Exp $	*/
+/*	$OpenBSD: ffs.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ffs.S,v 1.2 1994/10/26 06:39:57 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)ffs.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: ffs.S,v 1.2 1997/11/07 15:57:34 niklas Exp $"
+	.asciz "$OpenBSD: ffs.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif  /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/sparc/htonl.S b/sys/lib/libkern/arch/sparc/htonl.S
index 64ee5fa09f9..368d4e926da 100644
--- a/sys/lib/libkern/arch/sparc/htonl.S
+++ b/sys/lib/libkern/arch/sparc/htonl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htonl.S,v 1.2 1997/11/07 15:57:35 niklas Exp $	*/
+/*	$OpenBSD: htonl.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: htonl.S,v 1.2 1994/10/26 06:39:58 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)htonl.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: htonl.S,v 1.2 1997/11/07 15:57:35 niklas Exp $"
+	.asciz "$OpenBSD: htonl.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* netorder = htonl(hostorder) */
diff --git a/sys/lib/libkern/arch/sparc/htons.S b/sys/lib/libkern/arch/sparc/htons.S
index c5569f998fc..f37b16bf22a 100644
--- a/sys/lib/libkern/arch/sparc/htons.S
+++ b/sys/lib/libkern/arch/sparc/htons.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htons.S,v 1.2 1997/11/07 15:57:36 niklas Exp $	*/
+/*	$OpenBSD: htons.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -43,7 +39,7 @@
 #ifdef notdef
 	.asciz "@(#)htons.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: htons.S,v 1.2 1997/11/07 15:57:36 niklas Exp $"
+	.asciz "$OpenBSD: htons.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* netorder = htons(hostorder) */
diff --git a/sys/lib/libkern/arch/sparc/mul.S b/sys/lib/libkern/arch/sparc/mul.S
index 01bc767b333..25efe13c96d 100644
--- a/sys/lib/libkern/arch/sparc/mul.S
+++ b/sys/lib/libkern/arch/sparc/mul.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mul.S,v 1.4 1999/12/10 02:25:43 deraadt Exp $	*/
+/*	$OpenBSD: mul.S,v 1.5 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: mul.S,v 1.2 1994/10/26 06:40:01 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)mul.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: mul.S,v 1.4 1999/12/10 02:25:43 deraadt Exp $"
+	.asciz "$OpenBSD: mul.S,v 1.5 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/sys/lib/libkern/arch/sparc/ntohl.S b/sys/lib/libkern/arch/sparc/ntohl.S
index 280cbcb427d..85259e4d213 100644
--- a/sys/lib/libkern/arch/sparc/ntohl.S
+++ b/sys/lib/libkern/arch/sparc/ntohl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohl.S,v 1.2 1997/11/07 15:57:38 niklas Exp $	*/
+/*	$OpenBSD: ntohl.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ntohl.S,v 1.2 1994/10/26 06:40:03 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)ntohl.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: ntohl.S,v 1.2 1997/11/07 15:57:38 niklas Exp $"
+	.asciz "$OpenBSD: ntohl.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* hostorder = ntohl(netorder) */
diff --git a/sys/lib/libkern/arch/sparc/ntohs.S b/sys/lib/libkern/arch/sparc/ntohs.S
index 3484e41ee1d..185ab5dd935 100644
--- a/sys/lib/libkern/arch/sparc/ntohs.S
+++ b/sys/lib/libkern/arch/sparc/ntohs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohs.S,v 1.2 1997/11/07 15:57:39 niklas Exp $	*/
+/*	$OpenBSD: ntohs.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ntohs.S,v 1.2 1994/10/26 06:40:05 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)ntohs.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: ntohs.S,v 1.2 1997/11/07 15:57:39 niklas Exp $"
+	.asciz "$OpenBSD: ntohs.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* hostorder = ntohs(netorder) */
diff --git a/sys/lib/libkern/arch/sparc/saveregs.S b/sys/lib/libkern/arch/sparc/saveregs.S
index b78827631ae..01ebc7513eb 100644
--- a/sys/lib/libkern/arch/sparc/saveregs.S
+++ b/sys/lib/libkern/arch/sparc/saveregs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: saveregs.S,v 1.2 1997/11/07 15:57:40 niklas Exp $	*/
+/*	$OpenBSD: saveregs.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: saveregs.S,v 1.2 1994/10/26 06:40:07 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc/setjmp.S b/sys/lib/libkern/arch/sparc/setjmp.S
index 1a98275578b..47972029f4a 100644
--- a/sys/lib/libkern/arch/sparc/setjmp.S
+++ b/sys/lib/libkern/arch/sparc/setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.S,v 1.2 1997/11/07 15:57:40 niklas Exp $	*/
+/*	$OpenBSD: setjmp.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: setjmp.S,v 1.2 1994/10/26 06:40:08 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: setjmp.S,v 1.2 1997/11/07 15:57:40 niklas Exp $"
+	.asciz "$OpenBSD: setjmp.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/sys/lib/libkern/arch/sparc/strlen.S b/sys/lib/libkern/arch/sparc/strlen.S
index 447350880f9..22a040692c4 100644
--- a/sys/lib/libkern/arch/sparc/strlen.S
+++ b/sys/lib/libkern/arch/sparc/strlen.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlen.S,v 1.2 1997/11/07 15:57:41 niklas Exp $	*/
+/*	$OpenBSD: strlen.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: strlen.S,v 1.2 1994/10/26 06:40:09 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)strlen.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: strlen.S,v 1.2 1997/11/07 15:57:41 niklas Exp $"
+	.asciz "$OpenBSD: strlen.S,v 1.3 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 #include "DEFS.h"
diff --git a/sys/lib/libkern/arch/sparc/umul.S b/sys/lib/libkern/arch/sparc/umul.S
index c4bbb93f52e..c011b0d38f6 100644
--- a/sys/lib/libkern/arch/sparc/umul.S
+++ b/sys/lib/libkern/arch/sparc/umul.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umul.S,v 1.4 1999/12/10 02:25:44 deraadt Exp $	*/
+/*	$OpenBSD: umul.S,v 1.5 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: umul.S,v 1.2 1994/10/26 06:40:10 cgd Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -44,7 +40,7 @@
 #ifdef notdef
 	.asciz "@(#)umul.s	8.1 (Berkeley) 6/4/93"
 #endif
-	.asciz "$OpenBSD: umul.S,v 1.4 1999/12/10 02:25:44 deraadt Exp $"
+	.asciz "$OpenBSD: umul.S,v 1.5 2003/06/02 23:28:09 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/sys/lib/libkern/arch/sparc64/DEFS.h b/sys/lib/libkern/arch/sparc64/DEFS.h
index cc5023ebe0f..2c1422d7445 100644
--- a/sys/lib/libkern/arch/sparc64/DEFS.h
+++ b/sys/lib/libkern/arch/sparc64/DEFS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: DEFS.h,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: DEFS.h,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: DEFS.h,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/SYS.h b/sys/lib/libkern/arch/sparc64/SYS.h
index 31a73b71a9d..40e8168aa2d 100644
--- a/sys/lib/libkern/arch/sparc64/SYS.h
+++ b/sys/lib/libkern/arch/sparc64/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: SYS.h,v 1.2 1999/02/15 04:54:36 hubertf Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
@@ -39,7 +35,7 @@
  *	@(#)SYS.h	8.1 (Berkeley) 6/4/93
  *
  *	from: Header: SYS.h,v 1.2 92/07/03 18:57:00 torek Exp
- *	$Id: SYS.h,v 1.2 2001/08/20 20:15:29 jason Exp $
+ *	$Id: SYS.h,v 1.3 2003/06/02 23:28:09 millert Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/lib/libkern/arch/sparc64/_setjmp.S b/sys/lib/libkern/arch/sparc64/_setjmp.S
index 77f519260a0..ee4a2080302 100644
--- a/sys/lib/libkern/arch/sparc64/_setjmp.S
+++ b/sys/lib/libkern/arch/sparc64/_setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _setjmp.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: _setjmp.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: _setjmp.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/bzero.S b/sys/lib/libkern/arch/sparc64/bzero.S
index 8a700bea638..4515d22182d 100644
--- a/sys/lib/libkern/arch/sparc64/bzero.S
+++ b/sys/lib/libkern/arch/sparc64/bzero.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bzero.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: bzero.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: bzero.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/ffs.S b/sys/lib/libkern/arch/sparc64/ffs.S
index c6271d8a97e..935b5c609d6 100644
--- a/sys/lib/libkern/arch/sparc64/ffs.S
+++ b/sys/lib/libkern/arch/sparc64/ffs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: ffs.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ffs.S,v 1.2 1998/11/26 19:32:10 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/htonl.S b/sys/lib/libkern/arch/sparc64/htonl.S
index 4cb0431dc5a..bd92c1da76a 100644
--- a/sys/lib/libkern/arch/sparc64/htonl.S
+++ b/sys/lib/libkern/arch/sparc64/htonl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htonl.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: htonl.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: htonl.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/htons.S b/sys/lib/libkern/arch/sparc64/htons.S
index edea50cedb5..943a04d4c9e 100644
--- a/sys/lib/libkern/arch/sparc64/htons.S
+++ b/sys/lib/libkern/arch/sparc64/htons.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htons.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: htons.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/ntohl.S b/sys/lib/libkern/arch/sparc64/ntohl.S
index 1fa7f6c0461..6c13f9bd4bd 100644
--- a/sys/lib/libkern/arch/sparc64/ntohl.S
+++ b/sys/lib/libkern/arch/sparc64/ntohl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohl.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: ntohl.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ntohl.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/ntohs.S b/sys/lib/libkern/arch/sparc64/ntohs.S
index 8239f306584..e36932e8f7a 100644
--- a/sys/lib/libkern/arch/sparc64/ntohs.S
+++ b/sys/lib/libkern/arch/sparc64/ntohs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohs.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: ntohs.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ntohs.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/setjmp.S b/sys/lib/libkern/arch/sparc64/setjmp.S
index 4c8fa8d5908..38df5a781ee 100644
--- a/sys/lib/libkern/arch/sparc64/setjmp.S
+++ b/sys/lib/libkern/arch/sparc64/setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: setjmp.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: setjmp.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/arch/sparc64/strlen.S b/sys/lib/libkern/arch/sparc64/strlen.S
index fa099c13cd1..7f8fb0cd467 100644
--- a/sys/lib/libkern/arch/sparc64/strlen.S
+++ b/sys/lib/libkern/arch/sparc64/strlen.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlen.S,v 1.2 2001/08/20 20:15:29 jason Exp $	*/
+/*	$OpenBSD: strlen.S,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: strlen.S,v 1.1.1.1 1998/06/20 05:18:14 eeh Exp $	*/
 
 /*
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/ashldi3.c b/sys/lib/libkern/ashldi3.c
index 5c5918198c1..0c8b712527c 100644
--- a/sys/lib/libkern/ashldi3.c
+++ b/sys/lib/libkern/ashldi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ashldi3.c,v 1.2 1997/11/07 15:56:36 niklas Exp $	*/
+/*	$OpenBSD: ashldi3.c,v 1.3 2003/06/02 23:28:07 millert Exp $	*/
 /*	$NetBSD: ashldi3.c,v 1.5 1995/10/07 09:26:17 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)ashldi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: ashldi3.c,v 1.2 1997/11/07 15:56:36 niklas Exp $";
+static char rcsid[] = "$OpenBSD: ashldi3.c,v 1.3 2003/06/02 23:28:07 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/ashrdi3.c b/sys/lib/libkern/ashrdi3.c
index e7ef0ac16f9..916d5951da4 100644
--- a/sys/lib/libkern/ashrdi3.c
+++ b/sys/lib/libkern/ashrdi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ashrdi3.c,v 1.2 1997/11/07 15:56:37 niklas Exp $	*/
+/*	$OpenBSD: ashrdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: ashrdi3.c,v 1.5 1995/10/07 09:26:18 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)ashrdi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: ashrdi3.c,v 1.2 1997/11/07 15:56:37 niklas Exp $";
+static char rcsid[] = "$OpenBSD: ashrdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/bcmp.c b/sys/lib/libkern/bcmp.c
index d54c3ec8576..0714010ec0d 100644
--- a/sys/lib/libkern/bcmp.c
+++ b/sys/lib/libkern/bcmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcmp.c,v 1.5 2000/06/29 16:38:20 mickey Exp $	*/
+/*	$OpenBSD: bcmp.c,v 1.6 2003/06/02 23:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1987 Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -35,7 +31,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)bcmp.c	5.6 (Berkeley) 2/24/91";*/
-static char *rcsid = "$OpenBSD: bcmp.c,v 1.5 2000/06/29 16:38:20 mickey Exp $";
+static char *rcsid = "$OpenBSD: bcmp.c,v 1.6 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/bzero.c b/sys/lib/libkern/bzero.c
index cf147153faf..d4d110ab034 100644
--- a/sys/lib/libkern/bzero.c
+++ b/sys/lib/libkern/bzero.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bzero.c,v 1.3 1997/11/07 15:56:38 niklas Exp $	*/
+/*	$OpenBSD: bzero.c,v 1.4 2003/06/02 23:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1987 Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -35,7 +31,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)bzero.c	5.7 (Berkeley) 2/24/91";*/
-static char *rcsid = "$OpenBSD: bzero.c,v 1.3 1997/11/07 15:56:38 niklas Exp $";
+static char *rcsid = "$OpenBSD: bzero.c,v 1.4 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef _KERNEL
diff --git a/sys/lib/libkern/cmpdi2.c b/sys/lib/libkern/cmpdi2.c
index 3cf96b6adef..41f1af9776d 100644
--- a/sys/lib/libkern/cmpdi2.c
+++ b/sys/lib/libkern/cmpdi2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmpdi2.c,v 1.2 1997/11/07 15:56:39 niklas Exp $	*/
+/*	$OpenBSD: cmpdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: cmpdi2.c,v 1.5 1995/10/07 09:26:22 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmpdi2.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: cmpdi2.c,v 1.2 1997/11/07 15:56:39 niklas Exp $";
+static char rcsid[] = "$OpenBSD: cmpdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/divdi3.c b/sys/lib/libkern/divdi3.c
index ea4e6e92365..7cbbe39225e 100644
--- a/sys/lib/libkern/divdi3.c
+++ b/sys/lib/libkern/divdi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: divdi3.c,v 1.2 1997/11/07 15:56:40 niklas Exp $	*/
+/*	$OpenBSD: divdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: divdi3.c,v 1.5 1995/10/07 09:26:24 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)divdi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: divdi3.c,v 1.2 1997/11/07 15:56:40 niklas Exp $";
+static char rcsid[] = "$OpenBSD: divdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/imax.c b/sys/lib/libkern/imax.c
index 7c61784e4d5..ea00a86b6de 100644
--- a/sys/lib/libkern/imax.c
+++ b/sys/lib/libkern/imax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imax.c,v 1.2 1996/04/19 16:09:20 niklas Exp $	*/
+/*	$OpenBSD: imax.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: imax.c,v 1.3 1996/03/14 18:52:06 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/imin.c b/sys/lib/libkern/imin.c
index 5eef0b07818..a1feba40623 100644
--- a/sys/lib/libkern/imin.c
+++ b/sys/lib/libkern/imin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imin.c,v 1.2 1996/04/19 16:09:22 niklas Exp $	*/
+/*	$OpenBSD: imin.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: imin.c,v 1.3 1996/03/14 18:52:07 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/iordi3.c b/sys/lib/libkern/iordi3.c
index 3ece5c363b3..d641ae8d5fa 100644
--- a/sys/lib/libkern/iordi3.c
+++ b/sys/lib/libkern/iordi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iordi3.c,v 1.2 1997/11/07 15:56:41 niklas Exp $	*/
+/*	$OpenBSD: iordi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: iordi3.c,v 1.5 1995/10/07 09:26:28 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)iordi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: iordi3.c,v 1.2 1997/11/07 15:56:41 niklas Exp $";
+static char rcsid[] = "$OpenBSD: iordi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h
index 763385762bf..6f0df688d5a 100644
--- a/sys/lib/libkern/libkern.h
+++ b/sys/lib/libkern/libkern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libkern.h,v 1.17 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: libkern.h,v 1.18 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: libkern.h,v 1.7 1996/03/14 18:52:08 christos Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/lmax.c b/sys/lib/libkern/lmax.c
index 357a821d41f..9e56289ba3e 100644
--- a/sys/lib/libkern/lmax.c
+++ b/sys/lib/libkern/lmax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lmax.c,v 1.2 1996/04/19 16:09:25 niklas Exp $	*/
+/*	$OpenBSD: lmax.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: lmax.c,v 1.3 1996/03/14 18:52:09 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/lmin.c b/sys/lib/libkern/lmin.c
index 21cb58eec0d..e80b9c92944 100644
--- a/sys/lib/libkern/lmin.c
+++ b/sys/lib/libkern/lmin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lmin.c,v 1.2 1996/04/19 16:09:27 niklas Exp $	*/
+/*	$OpenBSD: lmin.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: lmin.c,v 1.3 1996/03/14 18:52:10 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/locc.c b/sys/lib/libkern/locc.c
index 59c226df4d3..770506325d2 100644
--- a/sys/lib/libkern/locc.c
+++ b/sys/lib/libkern/locc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locc.c,v 1.3 2001/07/09 04:16:43 mickey Exp $	*/
+/*	$OpenBSD: locc.c,v 1.4 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: locc.c,v 1.2 1994/10/26 06:42:29 cgd Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/lshldi3.c b/sys/lib/libkern/lshldi3.c
index 894b29bf164..189e4510362 100644
--- a/sys/lib/libkern/lshldi3.c
+++ b/sys/lib/libkern/lshldi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lshldi3.c,v 1.2 1997/11/07 15:56:43 niklas Exp $	*/
+/*	$OpenBSD: lshldi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: lshldi3.c,v 1.5 1995/10/07 09:26:29 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lshldi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: lshldi3.c,v 1.2 1997/11/07 15:56:43 niklas Exp $";
+static char rcsid[] = "$OpenBSD: lshldi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/lshrdi3.c b/sys/lib/libkern/lshrdi3.c
index 26462833df2..c4a5464df36 100644
--- a/sys/lib/libkern/lshrdi3.c
+++ b/sys/lib/libkern/lshrdi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lshrdi3.c,v 1.2 1997/11/07 15:56:44 niklas Exp $	*/
+/*	$OpenBSD: lshrdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: lshrdi3.c,v 1.5 1995/10/07 09:26:30 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lshrdi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: lshrdi3.c,v 1.2 1997/11/07 15:56:44 niklas Exp $";
+static char rcsid[] = "$OpenBSD: lshrdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/max.c b/sys/lib/libkern/max.c
index e0505d9ad2b..7a7222fe360 100644
--- a/sys/lib/libkern/max.c
+++ b/sys/lib/libkern/max.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: max.c,v 1.2 1996/04/19 16:09:28 niklas Exp $	*/
+/*	$OpenBSD: max.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: max.c,v 1.3 1996/03/14 18:52:12 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/mcount.c b/sys/lib/libkern/mcount.c
index d7f15abb8eb..29d1b0a8391 100644
--- a/sys/lib/libkern/mcount.c
+++ b/sys/lib/libkern/mcount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcount.c,v 1.5 2000/02/22 13:46:54 art Exp $	*/
+/*	$OpenBSD: mcount.c,v 1.6 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: mcount.c,v 1.3.6.1 1996/06/12 04:23:01 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: mcount.c,v 1.5 2000/02/22 13:46:54 art Exp $";
+static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif
 
diff --git a/sys/lib/libkern/memchr.c b/sys/lib/libkern/memchr.c
index 6224cd97ded..fe4a197b854 100644
--- a/sys/lib/libkern/memchr.c
+++ b/sys/lib/libkern/memchr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memchr.c,v 1.2 1998/06/27 01:21:03 mickey Exp $	*/
+/*	$OpenBSD: memchr.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/memcmp.c b/sys/lib/libkern/memcmp.c
index 2c40163f7c4..5fe351261f3 100644
--- a/sys/lib/libkern/memcmp.c
+++ b/sys/lib/libkern/memcmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memcmp.c,v 1.2 2000/06/29 16:18:52 mickey Exp $	*/
+/*	$OpenBSD: memcmp.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
@@ -37,7 +33,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: memcmp.c,v 1.2 2000/06/29 16:18:52 mickey Exp $";
+static char *rcsid = "$OpenBSD: memcmp.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/memset.c b/sys/lib/libkern/memset.c
index cc7f9a15568..0de0397bc84 100644
--- a/sys/lib/libkern/memset.c
+++ b/sys/lib/libkern/memset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memset.c,v 1.3 2002/04/24 21:53:12 espie Exp $	*/
+/*	$OpenBSD: memset.c,v 1.4 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: memset.c,v 1.6 1998/03/27 05:35:47 cgd Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/min.c b/sys/lib/libkern/min.c
index 9d9b9072a50..e355eed3db6 100644
--- a/sys/lib/libkern/min.c
+++ b/sys/lib/libkern/min.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: min.c,v 1.2 1996/04/19 16:09:29 niklas Exp $	*/
+/*	$OpenBSD: min.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: min.c,v 1.3 1996/03/14 18:52:13 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/moddi3.c b/sys/lib/libkern/moddi3.c
index ce314e376a4..f88434d5e20 100644
--- a/sys/lib/libkern/moddi3.c
+++ b/sys/lib/libkern/moddi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moddi3.c,v 1.2 1997/11/07 15:56:45 niklas Exp $	*/
+/*	$OpenBSD: moddi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: moddi3.c,v 1.5 1995/10/07 09:26:31 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)moddi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: moddi3.c,v 1.2 1997/11/07 15:56:45 niklas Exp $";
+static char rcsid[] = "$OpenBSD: moddi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/muldi3.c b/sys/lib/libkern/muldi3.c
index ea38cf75248..9c7ab1b55ae 100644
--- a/sys/lib/libkern/muldi3.c
+++ b/sys/lib/libkern/muldi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: muldi3.c,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: muldi3.c,v 1.5 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: muldi3.c,v 1.5 1995/10/07 09:26:33 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: muldi3.c,v 1.4 2002/03/14 01:27:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: muldi3.c,v 1.5 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/negdi2.c b/sys/lib/libkern/negdi2.c
index e792c03283f..9b74d96a494 100644
--- a/sys/lib/libkern/negdi2.c
+++ b/sys/lib/libkern/negdi2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: negdi2.c,v 1.2 1997/11/07 15:56:47 niklas Exp $	*/
+/*	$OpenBSD: negdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: negdi2.c,v 1.5 1995/10/07 09:26:34 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)negdi2.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: negdi2.c,v 1.2 1997/11/07 15:56:47 niklas Exp $";
+static char rcsid[] = "$OpenBSD: negdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/notdi2.c b/sys/lib/libkern/notdi2.c
index 533acf7b521..248fc1ca6ab 100644
--- a/sys/lib/libkern/notdi2.c
+++ b/sys/lib/libkern/notdi2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: notdi2.c,v 1.2 1997/11/07 15:56:47 niklas Exp $	*/
+/*	$OpenBSD: notdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: notdi2.c,v 1.5 1995/10/07 09:26:36 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)notdi2.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: notdi2.c,v 1.2 1997/11/07 15:56:47 niklas Exp $";
+static char rcsid[] = "$OpenBSD: notdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/qdivrem.c b/sys/lib/libkern/qdivrem.c
index 07cdd4b8f7a..537238a1534 100644
--- a/sys/lib/libkern/qdivrem.c
+++ b/sys/lib/libkern/qdivrem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qdivrem.c,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: qdivrem.c,v 1.5 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: qdivrem.c,v 1.5 1995/10/07 09:26:40 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #ifdef notdef
 static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.4 2002/03/14 01:27:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.5 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/sys/lib/libkern/quad.h b/sys/lib/libkern/quad.h
index b8ebe038388..486b614e614 100644
--- a/sys/lib/libkern/quad.h
+++ b/sys/lib/libkern/quad.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quad.h,v 1.7 2002/04/24 21:53:12 espie Exp $	*/
+/*	$OpenBSD: quad.h,v 1.8 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: quad.h,v 1.7 1996/04/18 02:20:04 cgd Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/random.c b/sys/lib/libkern/random.c
index 970cb37739c..44f95b8c096 100644
--- a/sys/lib/libkern/random.c
+++ b/sys/lib/libkern/random.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: random.c,v 1.5 1997/11/07 15:56:49 niklas Exp $	*/
+/*	$OpenBSD: random.c,v 1.6 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: random.c,v 1.2 1994/10/26 06:42:42 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/scanc.c b/sys/lib/libkern/scanc.c
index d73303a6d9f..82b7e37cd30 100644
--- a/sys/lib/libkern/scanc.c
+++ b/sys/lib/libkern/scanc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scanc.c,v 1.3 1996/12/06 12:21:07 niklas Exp $	*/
+/*	$OpenBSD: scanc.c,v 1.4 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: scanc.c,v 1.3 1996/03/14 18:52:16 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/skpc.c b/sys/lib/libkern/skpc.c
index e710ca639b0..a48e6ea9e62 100644
--- a/sys/lib/libkern/skpc.c
+++ b/sys/lib/libkern/skpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skpc.c,v 1.2 1996/04/19 16:09:36 niklas Exp $	*/
+/*	$OpenBSD: skpc.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: skpc.c,v 1.3 1996/03/14 18:52:18 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/srandom.c b/sys/lib/libkern/srandom.c
index d1d6ba535dc..b0864d37a26 100644
--- a/sys/lib/libkern/srandom.c
+++ b/sys/lib/libkern/srandom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: srandom.c,v 1.2 1996/08/11 21:05:47 niklas Exp $	*/
+/*	$OpenBSD: srandom.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/strcat.c b/sys/lib/libkern/strcat.c
index 9345ee82525..c09afa4ee48 100644
--- a/sys/lib/libkern/strcat.c
+++ b/sys/lib/libkern/strcat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcat.c,v 1.6 2003/05/12 17:09:18 deraadt Exp $	*/
+/*	$OpenBSD: strcat.c,v 1.7 2003/06/02 23:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -35,7 +31,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strcat.c	5.6 (Berkeley) 2/24/91";*/
-static char *rcsid = "$OpenBSD: strcat.c,v 1.6 2003/05/12 17:09:18 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strcat.c,v 1.7 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/strcmp.c b/sys/lib/libkern/strcmp.c
index 48ed56b162f..00606e91a67 100644
--- a/sys/lib/libkern/strcmp.c
+++ b/sys/lib/libkern/strcmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcmp.c,v 1.6 1998/06/27 01:21:05 mickey Exp $	*/
+/*	$OpenBSD: strcmp.c,v 1.7 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
@@ -38,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strcmp.c	5.5 (Berkeley) 1/26/91";*/
-static char *rcsid = "$OpenBSD: strcmp.c,v 1.6 1998/06/27 01:21:05 mickey Exp $";
+static char *rcsid = "$OpenBSD: strcmp.c,v 1.7 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/sys/lib/libkern/strcpy.c b/sys/lib/libkern/strcpy.c
index c7a3415bb3a..c68859f4540 100644
--- a/sys/lib/libkern/strcpy.c
+++ b/sys/lib/libkern/strcpy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcpy.c,v 1.6 2003/05/12 17:09:18 deraadt Exp $	*/
+/*	$OpenBSD: strcpy.c,v 1.7 2003/06/02 23:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -35,7 +31,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strcpy.c	5.7 (Berkeley) 2/24/91";*/
-static char *rcsid = "$OpenBSD: strcpy.c,v 1.6 2003/05/12 17:09:18 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strcpy.c,v 1.7 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/strlen.c b/sys/lib/libkern/strlen.c
index 6023b331f4d..3991469d318 100644
--- a/sys/lib/libkern/strlen.c
+++ b/sys/lib/libkern/strlen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlen.c,v 1.5 2001/07/29 21:15:23 millert Exp $	*/
+/*	$OpenBSD: strlen.c,v 1.6 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -34,7 +30,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlen.c,v 1.5 2001/07/29 21:15:23 millert Exp $";
+static char *rcsid = "$OpenBSD: strlen.c,v 1.6 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/strncmp.c b/sys/lib/libkern/strncmp.c
index bdfeb0220a0..28a15e953ea 100644
--- a/sys/lib/libkern/strncmp.c
+++ b/sys/lib/libkern/strncmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strncmp.c,v 1.6 1998/06/27 01:21:10 mickey Exp $	*/
+/*	$OpenBSD: strncmp.c,v 1.7 2003/06/02 23:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -35,7 +31,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strncmp.c	5.6 (Berkeley) 1/26/91";*/
-static char *rcsid = "$OpenBSD: strncmp.c,v 1.6 1998/06/27 01:21:10 mickey Exp $";
+static char *rcsid = "$OpenBSD: strncmp.c,v 1.7 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/sys/lib/libkern/strncpy.c b/sys/lib/libkern/strncpy.c
index b1cb68f3fee..f371a5703a3 100644
--- a/sys/lib/libkern/strncpy.c
+++ b/sys/lib/libkern/strncpy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strncpy.c,v 1.4 1998/06/27 01:07:59 mickey Exp $	*/
+/*	$OpenBSD: strncpy.c,v 1.5 2003/06/02 23:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
  * 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
+ * 3. 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.
  *
@@ -38,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strncpy.c	5.6 (Berkeley) 1/26/91";*/
-static char *rcsid = "$OpenBSD: strncpy.c,v 1.4 1998/06/27 01:07:59 mickey Exp $";
+static char *rcsid = "$OpenBSD: strncpy.c,v 1.5 2003/06/02 23:28:08 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/subdi3.c b/sys/lib/libkern/subdi3.c
index 99ca7ae5317..ac3fdb9296f 100644
--- a/sys/lib/libkern/subdi3.c
+++ b/sys/lib/libkern/subdi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subdi3.c,v 1.2 1997/11/07 15:56:52 niklas Exp $	*/
+/*	$OpenBSD: subdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: subdi3.c,v 1.5 1995/10/07 09:26:52 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)subdi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: subdi3.c,v 1.2 1997/11/07 15:56:52 niklas Exp $";
+static char rcsid[] = "$OpenBSD: subdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/ucmpdi2.c b/sys/lib/libkern/ucmpdi2.c
index a69c724880d..c100b656cb4 100644
--- a/sys/lib/libkern/ucmpdi2.c
+++ b/sys/lib/libkern/ucmpdi2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucmpdi2.c,v 1.2 1997/11/07 15:56:53 niklas Exp $	*/
+/*	$OpenBSD: ucmpdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: ucmpdi2.c,v 1.5 1995/10/07 09:26:53 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)ucmpdi2.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: ucmpdi2.c,v 1.2 1997/11/07 15:56:53 niklas Exp $";
+static char rcsid[] = "$OpenBSD: ucmpdi2.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/udivdi3.c b/sys/lib/libkern/udivdi3.c
index ba2a8898c53..6267ec311aa 100644
--- a/sys/lib/libkern/udivdi3.c
+++ b/sys/lib/libkern/udivdi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udivdi3.c,v 1.2 1997/11/07 15:56:54 niklas Exp $	*/
+/*	$OpenBSD: udivdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: udivdi3.c,v 1.5 1995/10/07 09:26:54 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)udivdi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: udivdi3.c,v 1.2 1997/11/07 15:56:54 niklas Exp $";
+static char rcsid[] = "$OpenBSD: udivdi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/ulmax.c b/sys/lib/libkern/ulmax.c
index e0b7817c43d..31687d6cb36 100644
--- a/sys/lib/libkern/ulmax.c
+++ b/sys/lib/libkern/ulmax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulmax.c,v 1.2 1996/04/19 16:09:40 niklas Exp $	*/
+/*	$OpenBSD: ulmax.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: ulmax.c,v 1.3 1996/03/14 18:52:23 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/ulmin.c b/sys/lib/libkern/ulmin.c
index d96e947a9ba..0589705b5d9 100644
--- a/sys/lib/libkern/ulmin.c
+++ b/sys/lib/libkern/ulmin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulmin.c,v 1.2 1996/04/19 16:09:41 niklas Exp $	*/
+/*	$OpenBSD: ulmin.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: ulmin.c,v 1.3 1996/03/14 18:52:25 christos Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libkern/umoddi3.c b/sys/lib/libkern/umoddi3.c
index ddf6cb44475..26f6c787113 100644
--- a/sys/lib/libkern/umoddi3.c
+++ b/sys/lib/libkern/umoddi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umoddi3.c,v 1.2 1997/11/07 15:56:55 niklas Exp $	*/
+/*	$OpenBSD: umoddi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: umoddi3.c,v 1.5 1995/10/07 09:26:55 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)umoddi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: umoddi3.c,v 1.2 1997/11/07 15:56:55 niklas Exp $";
+static char rcsid[] = "$OpenBSD: umoddi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libkern/xordi3.c b/sys/lib/libkern/xordi3.c
index 91f66c3d90a..ec33f2df2c4 100644
--- a/sys/lib/libkern/xordi3.c
+++ b/sys/lib/libkern/xordi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xordi3.c,v 1.2 1997/11/07 15:56:55 niklas Exp $	*/
+/*	$OpenBSD: xordi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $	*/
 /*	$NetBSD: xordi3.c,v 1.5 1995/10/07 09:26:56 mycroft Exp $	*/
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -42,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)xordi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: xordi3.c,v 1.2 1997/11/07 15:56:55 niklas Exp $";
+static char rcsid[] = "$OpenBSD: xordi3.c,v 1.3 2003/06/02 23:28:08 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/lib/libsa/alloc.c b/sys/lib/libsa/alloc.c
index c4be3a324d3..de916193fda 100644
--- a/sys/lib/libsa/alloc.c
+++ b/sys/lib/libsa/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.7 2003/06/01 17:00:32 deraadt Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.8 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: alloc.c,v 1.6 1997/02/04 18:36:33 thorpej Exp $	*/
 
 /*
@@ -19,11 +19,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/close.c b/sys/lib/libsa/close.c
index 9f399b8ea0e..0db50d53e98 100644
--- a/sys/lib/libsa/close.c
+++ b/sys/lib/libsa/close.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: close.c,v 1.6 2003/06/01 17:00:32 deraadt Exp $	*/
+/*	$OpenBSD: close.c,v 1.7 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: close.c,v 1.5 1995/09/06 19:53:29 pk Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/closeall.c b/sys/lib/libsa/closeall.c
index c330ae8fb17..0cf4de33589 100644
--- a/sys/lib/libsa/closeall.c
+++ b/sys/lib/libsa/closeall.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: closeall.c,v 1.3 2003/06/01 17:00:32 deraadt Exp $	*/
+/*	$OpenBSD: closeall.c,v 1.4 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: close.c,v 1.5 1995/09/06 19:53:29 pk Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/cons.c b/sys/lib/libsa/cons.c
index ae0a84f6a9a..6779002b57a 100644
--- a/sys/lib/libsa/cons.c
+++ b/sys/lib/libsa/cons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cons.c,v 1.9 1997/08/13 14:18:09 niklas Exp $	*/
+/*	$OpenBSD: cons.c,v 1.10 2003/06/02 23:28:09 millert Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/dev.c b/sys/lib/libsa/dev.c
index e3f6d85b3bb..b0d0d012696 100644
--- a/sys/lib/libsa/dev.c
+++ b/sys/lib/libsa/dev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev.c,v 1.2 1996/09/23 14:18:50 mickey Exp $	*/
+/*	$OpenBSD: dev.c,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: dev.c,v 1.4 1994/10/30 21:48:23 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/disklabel.c b/sys/lib/libsa/disklabel.c
index bf191290dc3..54264817ba5 100644
--- a/sys/lib/libsa/disklabel.c
+++ b/sys/lib/libsa/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.3 1996/09/23 14:18:51 mickey Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.4 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: disklabel.c,v 1.3 1994/10/26 05:44:42 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/dkcksum.c b/sys/lib/libsa/dkcksum.c
index 983b32af84e..1aba3a5ff49 100644
--- a/sys/lib/libsa/dkcksum.c
+++ b/sys/lib/libsa/dkcksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcksum.c,v 1.3 1996/09/23 14:18:51 mickey Exp $	*/
+/*	$OpenBSD: dkcksum.c,v 1.4 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: disklabel.c,v 1.3 1994/10/26 05:44:42 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/exec.c b/sys/lib/libsa/exec.c
index 236247058a0..df3e08d13a1 100644
--- a/sys/lib/libsa/exec.c
+++ b/sys/lib/libsa/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.23 2003/06/01 17:00:32 deraadt Exp $	*/
+/*	$OpenBSD: exec.c,v 1.24 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: exec.c,v 1.15 1996/10/13 02:29:01 christos Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/fstat.c b/sys/lib/libsa/fstat.c
index 303cacc85cd..fd6c579f29e 100644
--- a/sys/lib/libsa/fstat.c
+++ b/sys/lib/libsa/fstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fstat.c,v 1.2 1996/09/23 14:18:53 mickey Exp $	*/
+/*	$OpenBSD: fstat.c,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: stat.c,v 1.3 1994/10/26 05:45:07 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/getfile.c b/sys/lib/libsa/getfile.c
index 553c8cc3a83..1821e68431a 100644
--- a/sys/lib/libsa/getfile.c
+++ b/sys/lib/libsa/getfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getfile.c,v 1.3 1996/12/08 15:15:50 niklas Exp $	*/
+/*	$OpenBSD: getfile.c,v 1.4 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: getfile.c,v 1.6 1996/10/14 04:49:21 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/gets.c b/sys/lib/libsa/gets.c
index f61550113ad..95b2c28d029 100644
--- a/sys/lib/libsa/gets.c
+++ b/sys/lib/libsa/gets.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gets.c,v 1.2 1996/09/23 14:18:54 mickey Exp $	*/
+/*	$OpenBSD: gets.c,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: gets.c,v 1.5.2.1 1995/10/13 19:54:26 pk Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/ioctl.c b/sys/lib/libsa/ioctl.c
index 25ea2d83b8a..1941666af18 100644
--- a/sys/lib/libsa/ioctl.c
+++ b/sys/lib/libsa/ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioctl.c,v 1.3 2003/06/01 17:00:32 deraadt Exp $	*/
+/*	$OpenBSD: ioctl.c,v 1.4 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: ioctl.c,v 1.4 1994/10/30 21:48:24 cgd Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/loadfile.c b/sys/lib/libsa/loadfile.c
index 34916ab79ab..e047b3fec16 100644
--- a/sys/lib/libsa/loadfile.c
+++ b/sys/lib/libsa/loadfile.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile.c,v 1.5 2003/06/01 17:00:32 deraadt Exp $ */
+/* $OpenBSD: loadfile.c,v 1.6 2003/06/02 23:28:09 millert Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -53,11 +53,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/lseek.c b/sys/lib/libsa/lseek.c
index db8804292fa..c32b861015c 100644
--- a/sys/lib/libsa/lseek.c
+++ b/sys/lib/libsa/lseek.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lseek.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: lseek.c,v 1.6 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: lseek.c,v 1.3 1996/06/21 20:09:03 pk Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/memcmp.c b/sys/lib/libsa/memcmp.c
index 41b6dae579e..0ba1c2c18ca 100644
--- a/sys/lib/libsa/memcmp.c
+++ b/sys/lib/libsa/memcmp.c
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
@@ -35,7 +31,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: memcmp.c,v 1.4 1997/04/07 05:59:30 millert Exp $";
+static char *rcsid = "$OpenBSD: memcmp.c,v 1.5 2003/06/02 23:28:09 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "stand.h"
diff --git a/sys/lib/libsa/memcpy.c b/sys/lib/libsa/memcpy.c
index 3a2b2756bf8..3927af8f158 100644
--- a/sys/lib/libsa/memcpy.c
+++ b/sys/lib/libsa/memcpy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memcpy.c,v 1.3 1996/10/16 11:32:07 mickey Exp $	*/
+/*	$OpenBSD: memcpy.c,v 1.4 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: bcopy.c,v 1.5 1995/04/22 13:46:50 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/memset.c b/sys/lib/libsa/memset.c
index ad3e9b5dc1f..eefa3de990a 100644
--- a/sys/lib/libsa/memset.c
+++ b/sys/lib/libsa/memset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memset.c,v 1.1 1996/10/15 09:41:55 mickey Exp $	*/
+/*	$OpenBSD: memset.c,v 1.2 2003/06/02 23:28:09 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/nfs.h b/sys/lib/libsa/nfs.h
index 06acd5fffed..b020a75e1b0 100644
--- a/sys/lib/libsa/nfs.h
+++ b/sys/lib/libsa/nfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.h,v 1.6 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: nfs.h,v 1.7 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: nfs.h,v 1.5 1996/07/10 18:32:33 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/nfsv2.h b/sys/lib/libsa/nfsv2.h
index 0980daae1a6..6f516745450 100644
--- a/sys/lib/libsa/nfsv2.h
+++ b/sys/lib/libsa/nfsv2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsv2.h,v 1.4 1997/11/07 15:57:44 niklas Exp $	*/
+/*	$OpenBSD: nfsv2.h,v 1.5 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: nfsv2.h,v 1.2 1996/02/26 23:05:23 gwr Exp $	*/
 
 /*
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/nullfs.c b/sys/lib/libsa/nullfs.c
index 84c54cf549e..4b4ba3a1b4e 100644
--- a/sys/lib/libsa/nullfs.c
+++ b/sys/lib/libsa/nullfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nullfs.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: nullfs.c,v 1.6 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: open.c,v 1.9 1995/09/19 09:16:52 thorpej Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/open.c b/sys/lib/libsa/open.c
index f852f9c2786..d692b855015 100644
--- a/sys/lib/libsa/open.c
+++ b/sys/lib/libsa/open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: open.c,v 1.8 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: open.c,v 1.9 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: open.c,v 1.12 1996/09/30 16:01:21 ws Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/printf.c b/sys/lib/libsa/printf.c
index edb396d9b09..61587f2307c 100644
--- a/sys/lib/libsa/printf.c
+++ b/sys/lib/libsa/printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printf.c,v 1.19 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: printf.c,v 1.20 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/read.c b/sys/lib/libsa/read.c
index 96df4d799b2..14dc4508be9 100644
--- a/sys/lib/libsa/read.c
+++ b/sys/lib/libsa/read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: read.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: read.c,v 1.6 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: read.c,v 1.7 1996/06/21 20:29:28 pk Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/rpcv2.h b/sys/lib/libsa/rpcv2.h
index c82d28dad1b..7e08374a1f0 100644
--- a/sys/lib/libsa/rpcv2.h
+++ b/sys/lib/libsa/rpcv2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpcv2.h,v 1.4 1997/11/07 15:57:44 niklas Exp $	*/
+/*	$OpenBSD: rpcv2.h,v 1.5 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: rpcv2.h,v 1.1 1996/02/26 23:05:32 gwr Exp $	*/
 
 /*
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/saerrno.h b/sys/lib/libsa/saerrno.h
index c861542a05f..6c328b63803 100644
--- a/sys/lib/libsa/saerrno.h
+++ b/sys/lib/libsa/saerrno.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: saerrno.h,v 1.5 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: saerrno.h,v 1.6 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: saerrno.h,v 1.6 1995/09/18 21:19:45 pk Exp $	*/
 
 /*
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/saioctl.h b/sys/lib/libsa/saioctl.h
index 52624f3613a..964c8e96716 100644
--- a/sys/lib/libsa/saioctl.h
+++ b/sys/lib/libsa/saioctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: saioctl.h,v 1.2 1996/09/23 14:19:04 mickey Exp $	*/
+/*	$OpenBSD: saioctl.h,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: saioctl.h,v 1.2 1994/10/26 05:45:04 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index 126fe7bd039..a36ec9653db 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.40 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: stand.h,v 1.41 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/stat.c b/sys/lib/libsa/stat.c
index bdda62de0c7..c76066559eb 100644
--- a/sys/lib/libsa/stat.c
+++ b/sys/lib/libsa/stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stat.c,v 1.4 1997/04/02 05:21:48 mickey Exp $	*/
+/*	$OpenBSD: stat.c,v 1.5 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: stat.c,v 1.3 1994/10/26 05:45:07 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/strchr.c b/sys/lib/libsa/strchr.c
index c7026e484a5..c71d77fdc34 100644
--- a/sys/lib/libsa/strchr.c
+++ b/sys/lib/libsa/strchr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strchr.c,v 1.2 1998/06/01 17:02:21 mickey Exp $	*/
+/*	$OpenBSD: strchr.c,v 1.3 2003/06/02 23:28:09 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -34,7 +30,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strchr.c,v 1.2 1998/06/01 17:02:21 mickey Exp $";
+static char *rcsid = "$OpenBSD: strchr.c,v 1.3 2003/06/02 23:28:09 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef _STANDALONE
diff --git a/sys/lib/libsa/strerror.c b/sys/lib/libsa/strerror.c
index 04f2fbe4720..245541b8bc9 100644
--- a/sys/lib/libsa/strerror.c
+++ b/sys/lib/libsa/strerror.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strerror.c,v 1.6 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: strerror.c,v 1.7 2003/06/02 23:28:09 millert Exp $	*/
 /*	$NetBSD: strerror.c,v 1.11 1996/10/13 02:29:08 christos Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/strlen.c b/sys/lib/libsa/strlen.c
index e32ab327255..6be1dd2299a 100644
--- a/sys/lib/libsa/strlen.c
+++ b/sys/lib/libsa/strlen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlen.c,v 1.2 1997/07/14 22:03:10 mickey Exp $	*/
+/*	$OpenBSD: strlen.c,v 1.3 2003/06/02 23:28:10 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/strtol.c b/sys/lib/libsa/strtol.c
index a8558a938c8..b5427226c4f 100644
--- a/sys/lib/libsa/strtol.c
+++ b/sys/lib/libsa/strtol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strtol.c,v 1.3 1998/05/20 00:07:17 art Exp $ */
+/* $OpenBSD: strtol.c,v 1.4 2003/06/02 23:28:10 millert Exp $ */
 /* Modified strtol() from stdlib */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c
index 4cc342b47d8..b9eb7ae8fe6 100644
--- a/sys/lib/libsa/ufs.c
+++ b/sys/lib/libsa/ufs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs.c,v 1.14 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: ufs.c,v 1.15 2003/06/02 23:28:10 millert Exp $	*/
 /*	$NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/ufs.h b/sys/lib/libsa/ufs.h
index 411183eb159..3f68af48d24 100644
--- a/sys/lib/libsa/ufs.h
+++ b/sys/lib/libsa/ufs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs.h,v 1.5 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: ufs.h,v 1.6 2003/06/02 23:28:10 millert Exp $	*/
 /*	$NetBSD: ufs.h,v 1.5 1995/10/20 01:35:25 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,7 @@
  * 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
+ * 3. 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.
  *
diff --git a/sys/lib/libsa/write.c b/sys/lib/libsa/write.c
index 0cb9e540ae3..3d98e25805a 100644
--- a/sys/lib/libsa/write.c
+++ b/sys/lib/libsa/write.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: write.c,v 1.4 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: write.c,v 1.5 2003/06/02 23:28:10 millert Exp $	*/
 /*	$NetBSD: write.c,v 1.7 1996/06/21 20:29:30 pk Exp $	*/
 
 /*-
@@ -16,11 +16,7 @@
  * 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
+ * 3. 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.
  *