svn commit: r271105 - stable/10/sys/dev/fb

[Ed Maste]

Author: emaste
Date: Thu Sep  4 16:51:45 2014
New Revision: 271105
URL: http://svnweb.freebsd.org/changeset/base/271105

Log:
  MFC r260047: Clean up license text
  
    - Renumber Regents clauses
    - Remove clause 3 and 4 from TNF license, following upstream change
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/fb/boot_font.c
  stable/10/sys/dev/fb/gallant12x22.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/fb/boot_font.c
==============================================================================
--- stable/10/sys/dev/fb/boot_font.c	Thu Sep  4 16:40:54 2014	(r271104)
+++ stable/10/sys/dev/fb/boot_font.c	Thu Sep  4 16:51:45 2014	(r271105)
@@ -13,13 +13,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 the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: stable/10/sys/dev/fb/gallant12x22.c
==============================================================================
--- stable/10/sys/dev/fb/gallant12x22.c	Thu Sep  4 16:40:54 2014	(r271104)
+++ stable/10/sys/dev/fb/gallant12x22.c	Thu Sep  4 16:51:45 2014	(r271105)
@@ -17,7 +17,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *