Module Name:    src
Committed By:   snj
Date:           Wed Oct 21 23:12:10 UTC 2009

Modified Files:
        src/distrib/utils/ssh: ssh.c
        src/distrib/utils/tls: tls.c
        src/sbin/edlabel: edlabel.c
        src/sys/arch/alpha/stand/netboot: dev_net.c
        src/sys/arch/hp300/stand/common: netio.c rawfs.c
        src/sys/arch/i386/stand/lib/netif: netif_small.c netif_small.h
        src/sys/arch/mvme68k/stand/bootst: rawfs.c
        src/sys/arch/mvme68k/stand/libsa: SRT0.S
        src/sys/arch/newsmips/stand/boot: net.c netif_news.c
        src/sys/arch/sbmips/stand/netboot: dev_net.c
        src/sys/arch/sparc/stand/common: dvma.c net.c netif_sun.c
        src/sys/arch/sun68k/stand/tapeboot: rawfs.c
        src/sys/arch/vax/boot/boot: netio.c
        src/sys/dev: md.h
        src/sys/dev/sun: kbd_tables.c kbd_tables.h
        src/sys/lib/libsa: bootparam.c
        src/usr.sbin/mdconfig: mdconfig.c

Log Message:
Drop 3rd and 4th clauses.  Approved by gwr@ (copyright holder).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/ssh/ssh.c
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/tls/tls.c
cvs rdiff -u -r1.16 -r1.17 src/sbin/edlabel/edlabel.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/stand/netboot/dev_net.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/netio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/stand/common/rawfs.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/lib/netif/netif_small.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/lib/netif/netif_small.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvme68k/stand/bootst/rawfs.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvme68k/stand/libsa/SRT0.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/newsmips/stand/boot/net.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/newsmips/stand/boot/netif_news.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sbmips/stand/netboot/dev_net.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/stand/common/dvma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/common/net.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/common/netif_sun.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sun68k/stand/tapeboot/rawfs.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/boot/boot/netio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/md.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/sun/kbd_tables.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sun/kbd_tables.h
cvs rdiff -u -r1.18 -r1.19 src/sys/lib/libsa/bootparam.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mdconfig/mdconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/ssh/ssh.c
diff -u src/distrib/utils/ssh/ssh.c:1.2 src/distrib/utils/ssh/ssh.c:1.3
--- src/distrib/utils/ssh/ssh.c:1.2	Sun May 26 00:09:09 2002
+++ src/distrib/utils/ssh/ssh.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssh.c,v 1.2 2002/05/26 00:09:09 wiz Exp $	*/
+/*	$NetBSD: ssh.c,v 1.3 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/distrib/utils/tls/tls.c
diff -u src/distrib/utils/tls/tls.c:1.2 src/distrib/utils/tls/tls.c:1.3
--- src/distrib/utils/tls/tls.c:1.2	Sat Jun 24 05:12:13 2006
+++ src/distrib/utils/tls/tls.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.2 2006/06/24 05:12:13 mrg Exp $	*/
+/*	$NetBSD: tls.c,v 1.3 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sbin/edlabel/edlabel.c
diff -u src/sbin/edlabel/edlabel.c:1.16 src/sbin/edlabel/edlabel.c:1.17
--- src/sbin/edlabel/edlabel.c:1.16	Mon Oct 23 03:56:38 2006
+++ src/sbin/edlabel/edlabel.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: edlabel.c,v 1.16 2006/10/23 03:56:38 mrg Exp $	*/
+/*	$NetBSD: edlabel.c,v 1.17 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/alpha/stand/netboot/dev_net.c
diff -u src/sys/arch/alpha/stand/netboot/dev_net.c:1.14 src/sys/arch/alpha/stand/netboot/dev_net.c:1.15
--- src/sys/arch/alpha/stand/netboot/dev_net.c:1.14	Sat Mar 14 15:36:00 2009
+++ src/sys/arch/alpha/stand/netboot/dev_net.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.14 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: dev_net.c,v 1.15 2009/10/21 23:12:09 snj Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/hp300/stand/common/netio.c
diff -u src/sys/arch/hp300/stand/common/netio.c:1.12 src/sys/arch/hp300/stand/common/netio.c:1.13
--- src/sys/arch/hp300/stand/common/netio.c:1.12	Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/stand/common/netio.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netio.c,v 1.12 2008/04/28 20:23:19 martin Exp $	*/
+/*	$NetBSD: netio.c,v 1.13 2009/10/21 23:12:09 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/hp300/stand/common/rawfs.c
diff -u src/sys/arch/hp300/stand/common/rawfs.c:1.7 src/sys/arch/hp300/stand/common/rawfs.c:1.8
--- src/sys/arch/hp300/stand/common/rawfs.c:1.7	Sun Jun 25 17:36:07 2006
+++ src/sys/arch/hp300/stand/common/rawfs.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rawfs.c,v 1.7 2006/06/25 17:36:07 tsutsui Exp $	*/
+/*	$NetBSD: rawfs.c,v 1.8 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/i386/stand/lib/netif/netif_small.c
diff -u src/sys/arch/i386/stand/lib/netif/netif_small.c:1.11 src/sys/arch/i386/stand/lib/netif/netif_small.c:1.12
--- src/sys/arch/i386/stand/lib/netif/netif_small.c:1.11	Sat Mar 14 15:36:07 2009
+++ src/sys/arch/i386/stand/lib/netif/netif_small.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netif_small.c,v 1.11 2009/03/14 15:36:07 dsl Exp $	*/
+/*	$NetBSD: netif_small.c,v 1.12 2009/10/21 23:12:09 snj Exp $	*/
 
 /* minimal netif - for boot ROMs we don't have to select between
   several interfaces, and we have to save space
@@ -18,11 +18,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/i386/stand/lib/netif/netif_small.h
diff -u src/sys/arch/i386/stand/lib/netif/netif_small.h:1.4 src/sys/arch/i386/stand/lib/netif/netif_small.h:1.5
--- src/sys/arch/i386/stand/lib/netif/netif_small.h:1.4	Sun Dec 14 18:46:33 2008
+++ src/sys/arch/i386/stand/lib/netif/netif_small.h	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netif_small.h,v 1.4 2008/12/14 18:46:33 christos Exp $	*/
+/*	$NetBSD: netif_small.h,v 1.5 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/mvme68k/stand/bootst/rawfs.c
diff -u src/sys/arch/mvme68k/stand/bootst/rawfs.c:1.10 src/sys/arch/mvme68k/stand/bootst/rawfs.c:1.11
--- src/sys/arch/mvme68k/stand/bootst/rawfs.c:1.10	Sat Jan 12 09:54:30 2008
+++ src/sys/arch/mvme68k/stand/bootst/rawfs.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rawfs.c,v 1.10 2008/01/12 09:54:30 tsutsui Exp $	*/
+/*	$NetBSD: rawfs.c,v 1.11 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/mvme68k/stand/libsa/SRT0.S
diff -u src/sys/arch/mvme68k/stand/libsa/SRT0.S:1.3 src/sys/arch/mvme68k/stand/libsa/SRT0.S:1.4
--- src/sys/arch/mvme68k/stand/libsa/SRT0.S:1.3	Thu Nov 30 22:26:27 2000
+++ src/sys/arch/mvme68k/stand/libsa/SRT0.S	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-|	$NetBSD: SRT0.S,v 1.3 2000/11/30 22:26:27 scw Exp $
+|	$NetBSD: SRT0.S,v 1.4 2009/10/21 23:12:09 snj Exp $
 
 | Copyright (c) 1995 Gordon W. Ross
 | All rights reserved.
@@ -11,11 +11,6 @@
 | 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. The name of the author may not be used to endorse or promote products
-|    derived from this software without specific prior written permission.
-| 4. All advertising materials mentioning features or use of this software
-|    must display the following acknowledgement:
-|      This product includes software developed by Gordon Ross
 |
 | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 | IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/newsmips/stand/boot/net.c
diff -u src/sys/arch/newsmips/stand/boot/net.c:1.4 src/sys/arch/newsmips/stand/boot/net.c:1.5
--- src/sys/arch/newsmips/stand/boot/net.c:1.4	Sun Dec 11 12:18:25 2005
+++ src/sys/arch/newsmips/stand/boot/net.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: net.c,v 1.4 2005/12/11 12:18:25 christos Exp $	*/
+/*	$NetBSD: net.c,v 1.5 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/newsmips/stand/boot/netif_news.c
diff -u src/sys/arch/newsmips/stand/boot/netif_news.c:1.7 src/sys/arch/newsmips/stand/boot/netif_news.c:1.8
--- src/sys/arch/newsmips/stand/boot/netif_news.c:1.7	Mon Jan 12 11:32:44 2009
+++ src/sys/arch/newsmips/stand/boot/netif_news.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netif_news.c,v 1.7 2009/01/12 11:32:44 tsutsui Exp $	*/
+/*	$NetBSD: netif_news.c,v 1.8 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/sbmips/stand/netboot/dev_net.c
diff -u src/sys/arch/sbmips/stand/netboot/dev_net.c:1.4 src/sys/arch/sbmips/stand/netboot/dev_net.c:1.5
--- src/sys/arch/sbmips/stand/netboot/dev_net.c:1.4	Sat Mar 14 15:36:13 2009
+++ src/sys/arch/sbmips/stand/netboot/dev_net.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.4 2009/03/14 15:36:13 dsl Exp $ */
+/* $NetBSD: dev_net.c,v 1.5 2009/10/21 23:12:09 snj Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/sparc/stand/common/dvma.c
diff -u src/sys/arch/sparc/stand/common/dvma.c:1.14 src/sys/arch/sparc/stand/common/dvma.c:1.15
--- src/sys/arch/sparc/stand/common/dvma.c:1.14	Thu Jul 13 20:03:34 2006
+++ src/sys/arch/sparc/stand/common/dvma.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dvma.c,v 1.14 2006/07/13 20:03:34 uwe Exp $	*/
+/*	$NetBSD: dvma.c,v 1.15 2009/10/21 23:12:09 snj Exp $	*/
 /*
  * Copyright (c) 1995 Gordon W. Ross
  * All rights reserved.
@@ -11,11 +11,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/sparc/stand/common/net.c
diff -u src/sys/arch/sparc/stand/common/net.c:1.8 src/sys/arch/sparc/stand/common/net.c:1.9
--- src/sys/arch/sparc/stand/common/net.c:1.8	Thu Jul 13 20:03:34 2006
+++ src/sys/arch/sparc/stand/common/net.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: net.c,v 1.8 2006/07/13 20:03:34 uwe Exp $	*/
+/*	$NetBSD: net.c,v 1.9 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/sparc/stand/common/netif_sun.c
diff -u src/sys/arch/sparc/stand/common/netif_sun.c:1.11 src/sys/arch/sparc/stand/common/netif_sun.c:1.12
--- src/sys/arch/sparc/stand/common/netif_sun.c:1.11	Wed Mar 18 16:00:15 2009
+++ src/sys/arch/sparc/stand/common/netif_sun.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netif_sun.c,v 1.11 2009/03/18 16:00:15 cegger Exp $	*/
+/*	$NetBSD: netif_sun.c,v 1.12 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/sun68k/stand/tapeboot/rawfs.c
diff -u src/sys/arch/sun68k/stand/tapeboot/rawfs.c:1.7 src/sys/arch/sun68k/stand/tapeboot/rawfs.c:1.8
--- src/sys/arch/sun68k/stand/tapeboot/rawfs.c:1.7	Mon Jan 12 07:01:00 2009
+++ src/sys/arch/sun68k/stand/tapeboot/rawfs.c	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rawfs.c,v 1.7 2009/01/12 07:01:00 tsutsui Exp $	*/
+/*	$NetBSD: rawfs.c,v 1.8 2009/10/21 23:12:10 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/vax/boot/boot/netio.c
diff -u src/sys/arch/vax/boot/boot/netio.c:1.13 src/sys/arch/vax/boot/boot/netio.c:1.14
--- src/sys/arch/vax/boot/boot/netio.c:1.13	Wed Mar 18 17:06:47 2009
+++ src/sys/arch/vax/boot/boot/netio.c	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: netio.c,v 1.13 2009/03/18 17:06:47 cegger Exp $	*/
+/*	$NetBSD: netio.c,v 1.14 2009/10/21 23:12:10 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/dev/md.h
diff -u src/sys/dev/md.h:1.9 src/sys/dev/md.h:1.10
--- src/sys/dev/md.h:1.9	Fri May  2 13:02:31 2008
+++ src/sys/dev/md.h	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.9 2008/05/02 13:02:31 ad Exp $	*/
+/*	$NetBSD: md.h,v 1.10 2009/10/21 23:12:10 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/dev/sun/kbd_tables.c
diff -u src/sys/dev/sun/kbd_tables.c:1.9 src/sys/dev/sun/kbd_tables.c:1.10
--- src/sys/dev/sun/kbd_tables.c:1.9	Sun Dec 11 12:23:56 2005
+++ src/sys/dev/sun/kbd_tables.c	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd_tables.c,v 1.9 2005/12/11 12:23:56 christos Exp $	*/
+/*	$NetBSD: kbd_tables.c,v 1.10 2009/10/21 23:12:10 snj Exp $	*/
 
 /*
  * Copyright (c) 1996 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -35,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_tables.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_tables.c,v 1.10 2009/10/21 23:12:10 snj Exp $");
 
 #include <sys/types.h>
 

Index: src/sys/dev/sun/kbd_tables.h
diff -u src/sys/dev/sun/kbd_tables.h:1.4 src/sys/dev/sun/kbd_tables.h:1.5
--- src/sys/dev/sun/kbd_tables.h:1.4	Tue Dec 17 20:46:14 1996
+++ src/sys/dev/sun/kbd_tables.h	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd_tables.h,v 1.4 1996/12/17 20:46:14 gwr Exp $	*/
+/*	$NetBSD: kbd_tables.h,v 1.5 2009/10/21 23:12:10 snj Exp $	*/
 
 /*
  * Copyright (c) 1996 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/lib/libsa/bootparam.c
diff -u src/sys/lib/libsa/bootparam.c:1.18 src/sys/lib/libsa/bootparam.c:1.19
--- src/sys/lib/libsa/bootparam.c:1.18	Sat Jan 17 14:00:36 2009
+++ src/sys/lib/libsa/bootparam.c	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootparam.c,v 1.18 2009/01/17 14:00:36 tsutsui Exp $	*/
+/*	$NetBSD: bootparam.c,v 1.19 2009/10/21 23:12:10 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/usr.sbin/mdconfig/mdconfig.c
diff -u src/usr.sbin/mdconfig/mdconfig.c:1.4 src/usr.sbin/mdconfig/mdconfig.c:1.5
--- src/usr.sbin/mdconfig/mdconfig.c:1.4	Tue Nov  1 01:42:29 2005
+++ src/usr.sbin/mdconfig/mdconfig.c	Wed Oct 21 23:12:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdconfig.c,v 1.4 2005/11/01 01:42:29 chs Exp $	*/
+/*	$NetBSD: mdconfig.c,v 1.5 2009/10/21 23:12:10 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdconfig.c,v 1.4 2005/11/01 01:42:29 chs Exp $");
+__RCSID("$NetBSD: mdconfig.c,v 1.5 2009/10/21 23:12:10 snj Exp $");
 #endif
 
 /*

Reply via email to