[src/trunk]: src/sys/arch/i386/stand/netboot Drop 3rd and 4th clauses. OK gw...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b60ad9ce236a
branches:  trunk
changeset: 748381:b60ad9ce236a
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Oct 22 19:10:42 2009 +0000

description:
Drop 3rd and 4th clauses.  OK gwr@ drochner@ (copyright holders).

diffstat:

 sys/arch/i386/stand/netboot/dev_net.c |  7 +------
 sys/arch/i386/stand/netboot/dev_net.h |  7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diffs (42 lines):

diff -r 3bfdfe9bd406 -r b60ad9ce236a sys/arch/i386/stand/netboot/dev_net.c
--- a/sys/arch/i386/stand/netboot/dev_net.c     Thu Oct 22 18:59:30 2009 +0000
+++ b/sys/arch/i386/stand/netboot/dev_net.c     Thu Oct 22 19:10:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dev_net.c,v 1.14 2009/03/14 21:04:10 dsl Exp $  */
+/*     $NetBSD: dev_net.c,v 1.15 2009/10/22 19:10:42 snj Exp $  */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -14,11 +14,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
diff -r 3bfdfe9bd406 -r b60ad9ce236a sys/arch/i386/stand/netboot/dev_net.h
--- a/sys/arch/i386/stand/netboot/dev_net.h     Thu Oct 22 18:59:30 2009 +0000
+++ b/sys/arch/i386/stand/netboot/dev_net.h     Thu Oct 22 19:10:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dev_net.h,v 1.2 2009/03/14 14:46:00 dsl Exp $  */
+/*     $NetBSD: dev_net.h,v 1.3 2009/10/22 19:10:42 snj Exp $  */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -14,11 +14,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