Module Name: src
Committed By: snj
Date: Wed Oct 21 00:30:43 UTC 2009
Modified Files:
src/share/man/man4: kse.4 stpcide.4
src/sys/arch/arm/iomd: vidcvideo.c
Log Message:
Remove 3rd and 4th clauses. OK'd by Tohru Nishimura and Reinoud Zandijk
(copyright holders).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/kse.4
cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/stpcide.4
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/iomd/vidcvideo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/kse.4
diff -u src/share/man/man4/kse.4:1.8 src/share/man/man4/kse.4:1.9
--- src/share/man/man4/kse.4:1.8 Wed May 27 19:23:59 2009
+++ src/share/man/man4/kse.4 Wed Oct 21 00:30:43 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: kse.4,v 1.8 2009/05/27 19:23:59 snj Exp $
+.\" $NetBSD: kse.4,v 1.9 2009/10/21 00:30:43 snj Exp $
.\"
.\" Copyright (c) 2006 Tohru Nishimura.
.\"
@@ -10,11 +10,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. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by Tohru Nishimura.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/share/man/man4/stpcide.4
diff -u src/share/man/man4/stpcide.4:1.7 src/share/man/man4/stpcide.4:1.8
--- src/share/man/man4/stpcide.4:1.7 Sat Aug 21 21:46:54 2004
+++ src/share/man/man4/stpcide.4 Wed Oct 21 00:30:43 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: stpcide.4,v 1.7 2004/08/21 21:46:54 nisimura Exp $
+.\" $NetBSD: stpcide.4,v 1.8 2009/10/21 00:30:43 snj Exp $
.\"
.\" Copyright (c) 2003 Tohru Nishimura.
.\"
@@ -10,11 +10,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. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by Tohru Nishimura.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/iomd/vidcvideo.c
diff -u src/sys/arch/arm/iomd/vidcvideo.c:1.37 src/sys/arch/arm/iomd/vidcvideo.c:1.38
--- src/sys/arch/arm/iomd/vidcvideo.c:1.37 Wed Mar 18 16:00:09 2009
+++ src/sys/arch/arm/iomd/vidcvideo.c Wed Oct 21 00:30:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.37 2009/03/18 16:00:09 cegger Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@@ -12,12 +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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tohru Nishimura
- * and Reinoud Zandijk for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -36,7 +30,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.37 2009/03/18 16:00:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
