From patchwork Wed Dec 14 22:37:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 9474905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4D86607EE for ; Wed, 14 Dec 2016 22:46:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 952FD2869A for ; Wed, 14 Dec 2016 22:46:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89A3F286D4; Wed, 14 Dec 2016 22:46:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 298CD2869A for ; Wed, 14 Dec 2016 22:46:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cHIHS-0004Dd-EK; Wed, 14 Dec 2016 22:44:10 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cHIC7-0007gA-Az for linux-arm-kernel@lists.infradead.org; Wed, 14 Dec 2016 22:38:57 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 2E03E20E95; Wed, 14 Dec 2016 23:38:09 +0100 (CET) Received: from localhost (unknown [88.191.26.124]) by mail.free-electrons.com (Postfix) with ESMTPSA id E242520E61; Wed, 14 Dec 2016 23:38:08 +0100 (CET) From: Alexandre Belloni To: Gregory Clement Subject: [PATCH 09/39] ARM: dts: armada-370-xp: Correct license text Date: Wed, 14 Dec 2016 23:37:16 +0100 Message-Id: <20161214223746.23066-10-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161214223746.23066-1-alexandre.belloni@free-electrons.com> References: <20161214223746.23066-1-alexandre.belloni@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161214_143840_174270_B0401979 X-CRM114-Status: GOOD ( 10.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lior Amsalem , Andrew Lunn , Yehuda Yitschak , Heikki Krogerus , Jason Cooper , Kevin Hilman , Simon Guinot , Arnaud Ebalard , linux-kernel@vger.kernel.org, Willy Tarreau , Nobuhiro Iwamatsu , Ben Dooks , Alexandre Belloni , Ezequiel Garcia , Greg Ungerer , Lorenzo Pieralisi , Maxime Ripard , Stefan Roese , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, Simon Baatz MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The license test has been mangled at some point then copy pasted across multiple files. Restore it to what it should be. Note that this is not intended as a license change. Cc: Arnaud Ebalard Cc: Ben Dooks Cc: Ezequiel Garcia Cc: Greg Ungerer Cc: Heikki Krogerus Cc: Kevin Hilman Cc: Lior Amsalem Cc: Lorenzo Pieralisi Cc: Maxime Ripard Cc: Nobuhiro Iwamatsu Cc: Simon Baatz Cc: Simon Guinot Cc: Stefan Roese Cc: Thomas Petazzoni Cc: Willy Tarreau Cc: Yehuda Yitschak Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/armada-370-xp.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 3ccedc9dffb2..743b2ec2af4f 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -18,17 +18,17 @@ * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. * - * This file is distributed in the hope that it will be useful + * This file is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * Or, alternatively + * Or, alternatively, * * b) Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use + * restriction, including without limitation the rights to use, * copy, modify, merge, publish, distribute, sublicense, and/or * sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following @@ -37,11 +37,11 @@ * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE.