From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934769AbcLNX6s (ORCPT ); Wed, 14 Dec 2016 18:58:48 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:37181 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934055AbcLNX6o (ORCPT ); Wed, 14 Dec 2016 18:58:44 -0500 From: Alexandre Belloni To: Shawn Guo Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Belloni , Bill Pringlemeir , Chao Fu , Chircu Bogdan , Cory Tusar , Cosmin Stoica , Eddy Petrisor , Fugang Duan , Jingchang Lu , Stefan Agner , Xiubo Li Subject: [PATCH 35/37] ARM: dts: vf610-twr: Correct license text Date: Thu, 15 Dec 2016 00:57:44 +0100 Message-Id: <20161214235746.7108-36-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161214235746.7108-1-alexandre.belloni@free-electrons.com> References: <20161214235746.7108-1-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Bill Pringlemeir Cc: Chao Fu Cc: Chircu Bogdan Cc: Cory Tusar Cc: Cosmin Stoica Cc: Eddy Petrisor Cc: Fugang Duan Cc: Jingchang Lu Cc: Stefan Agner Cc: Xiubo Li Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/vf610-twr.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts index cdc100732514..53e3b8b250c6 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts @@ -10,17 +10,17 @@ * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. * - * 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 @@ -29,11 +29,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. -- 2.10.2