From owner-svn-src-all@FreeBSD.ORG Tue Dec 24 18:48:29 2013 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 EB44FE80; Tue, 24 Dec 2013 18:48:29 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCCF51751; Tue, 24 Dec 2013 18:48:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOImTee021956; Tue, 24 Dec 2013 18:48:29 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOImTBq021954; Tue, 24 Dec 2013 18:48:29 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201312241848.rBOImTBq021954@svn.freebsd.org> From: John Baldwin Date: Tue, 24 Dec 2013 18:48:29 +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: r259831 - stable/10/sys/arm/econa 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.17 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: Tue, 24 Dec 2013 18:48:30 -0000 Author: jhb Date: Tue Dec 24 18:48:29 2013 New Revision: 259831 URL: http://svnweb.freebsd.org/changeset/base/259831 Log: MFC 258177: Remove an incorrectly copied and pasted clause from these license statements. Modified: stable/10/sys/arm/econa/uart_bus_ec.c stable/10/sys/arm/econa/uart_cpu_ec.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/econa/uart_bus_ec.c ============================================================================== --- stable/10/sys/arm/econa/uart_bus_ec.c Tue Dec 24 18:42:26 2013 (r259830) +++ stable/10/sys/arm/econa/uart_bus_ec.c Tue Dec 24 18:48:29 2013 (r259831) @@ -11,9 +11,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. Neither the name of MARVELL nor the names of contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/10/sys/arm/econa/uart_cpu_ec.c ============================================================================== --- stable/10/sys/arm/econa/uart_cpu_ec.c Tue Dec 24 18:42:26 2013 (r259830) +++ stable/10/sys/arm/econa/uart_cpu_ec.c Tue Dec 24 18:48:29 2013 (r259831) @@ -12,9 +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. Neither the name of MARVELL nor the names of contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE