svn commit: r202396 - stable/7/sys/dev/mc146818

[Marius Strobl]

Author: marius
Date: Fri Jan 15 16:29:41 2010
New Revision: 202396
URL: http://svn.freebsd.org/changeset/base/202396

Log:
  MFC: r201009
  
  Remove clause 3 from Izumi Tsutsui's licenses.
  
  Obtained from:	NetBSD

Modified:
  stable/7/sys/dev/mc146818/mc146818.c
  stable/7/sys/dev/mc146818/mc146818var.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mc146818/mc146818.c
==============================================================================
--- stable/7/sys/dev/mc146818/mc146818.c	Fri Jan 15 16:29:40 2010	(r202395)
+++ stable/7/sys/dev/mc146818/mc146818.c	Fri Jan 15 16:29:41 2010	(r202396)
@@ -9,8 +9,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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -23,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	from: NetBSD: mc146818.c,v 1.4 2003/11/24 06:20:40 tsutsui Exp
+ *	$NetBSD: mc146818.c,v 1.16 2008/05/14 13:29:28 tsutsui Exp $
  */
 
 #include <sys/cdefs.h>

Modified: stable/7/sys/dev/mc146818/mc146818var.h
==============================================================================
--- stable/7/sys/dev/mc146818/mc146818var.h	Fri Jan 15 16:29:40 2010	(r202395)
+++ stable/7/sys/dev/mc146818/mc146818var.h	Fri Jan 15 16:29:41 2010	(r202396)
@@ -9,8 +9,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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -23,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	from: NetBSD: mc146818var.h,v 1.3 2003/11/24 06:20:40 tsutsui Exp
+ *	$NetBSD: mc146818var.h,v 1.7 2008/05/14 13:29:29 tsutsui Exp $
  *
  * $FreeBSD$
  */