From owner-svn-src-all@FreeBSD.ORG Thu Sep 4 16:51:46 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 596B8577; Thu, 4 Sep 2014 16:51:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C6BF14BD; Thu, 4 Sep 2014 16:51:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s84Gpk7e027330; Thu, 4 Sep 2014 16:51:46 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s84Gpj3s027328; Thu, 4 Sep 2014 16:51:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409041651.s84Gpj3s027328@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 4 Sep 2014 16:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271105 - stable/10/sys/dev/fb X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2014 16:51:46 -0000 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. *