Module Name: src Committed By: snj Date: Thu Oct 22 19:10:43 UTC 2009
Modified Files: src/sys/arch/i386/stand/netboot: dev_net.c dev_net.h Log Message: Drop 3rd and 4th clauses. OK gwr@ drochner@ (copyright holders). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/stand/netboot/dev_net.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/netboot/dev_net.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/i386/stand/netboot/dev_net.c diff -u src/sys/arch/i386/stand/netboot/dev_net.c:1.14 src/sys/arch/i386/stand/netboot/dev_net.c:1.15 --- src/sys/arch/i386/stand/netboot/dev_net.c:1.14 Sat Mar 14 21:04:10 2009 +++ src/sys/arch/i386/stand/netboot/dev_net.c Thu Oct 22 19:10:42 2009 @@ -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 Index: src/sys/arch/i386/stand/netboot/dev_net.h diff -u src/sys/arch/i386/stand/netboot/dev_net.h:1.2 src/sys/arch/i386/stand/netboot/dev_net.h:1.3 --- src/sys/arch/i386/stand/netboot/dev_net.h:1.2 Sat Mar 14 14:46:00 2009 +++ src/sys/arch/i386/stand/netboot/dev_net.h Thu Oct 22 19:10:42 2009 @@ -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