linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Gregory Clement <gregory.clement@free-electrons.com>
Cc: "Andrew Lunn" <andrew@lunn.ch>,
	"Jason Cooper" <jason@lakedaemon.net>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	"Alexandre Belloni" <alexandre.belloni@free-electrons.com>,
	"Arnaud Ebalard" <arno@natisbad.org>,
	"Rafał Miłecki" <zajec5@gmail.com>,
	"Boris Brezillon" <boris.brezillon@free-electrons.com>,
	"Stefan Roese" <sr@denx.de>,
	"Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>
Subject: [PATCH 08/39] ARM: dts: armada-370-synology-ds213j: Correct license text
Date: Wed, 14 Dec 2016 23:37:15 +0100	[thread overview]
Message-ID: <20161214223746.23066-9-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <20161214223746.23066-1-alexandre.belloni@free-electrons.com>

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 <arno@natisbad.org>
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370-synology-ds213j.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
index a9cc42776874..384d50a382ef 100644
--- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
@@ -13,17 +13,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
@@ -32,11 +32,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

  parent reply	other threads:[~2016-12-14 22:38 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20161214223746.23066-1-alexandre.belloni@free-electrons.com>
2016-12-14 22:37 ` [PATCH 01/39] ARM: dts: armada-370-db: Correct license text Alexandre Belloni
2016-12-14 22:37 ` [PATCH 02/39] ARM: dts: armada-370-dlink-dns327l: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 03/39] ARM: dts: armada-370: " Alexandre Belloni
2016-12-15  7:33   ` Uwe Kleine-König
2016-12-14 22:37 ` [PATCH 04/39] ARM: dts: armada-370-mirabox: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 05/39] ARM: dts: armada-370-netgear-rn102: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 06/39] ARM: dts: armada-370-netgear-rn104: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 07/39] ARM: dts: armada-370-rd: " Alexandre Belloni
2016-12-15  0:12   ` Florian Fainelli
2016-12-14 22:37 ` Alexandre Belloni [this message]
2016-12-14 22:37 ` [PATCH 09/39] ARM: dts: armada-370-xp: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 10/39] ARM: dts: armada-375-db: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 11/39] ARM: dts: armada-375: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 12/39] ARM: dts: armada-38x: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 13/39] ARM: dts: armada-388-clearfog: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 14/39] ARM: dts: armada-388-db: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 15/39] ARM: dts: armada-388-rd: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 16/39] ARM: dts: armada-38x-solidrun-microsom: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 17/39] ARM: dts: armada-390-db: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 18/39] ARM: dts: armada-390: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 19/39] ARM: dts: armada-395: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 20/39] ARM: dts: armada-398-db: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 21/39] ARM: dts: armada-398: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 22/39] ARM: dts: armada-39x: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 23/39] ARM: dts: armada-xp-axpwifiap: " Alexandre Belloni
2016-12-15 10:38   ` Sebastian Hesselbarth
2016-12-14 22:37 ` [PATCH 24/39] ARM: dts: armada-xp-db: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 25/39] ARM: dts: armada-xp: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 26/39] ARM: dts: armada-xp-gp: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 27/39] ARM: dts: armada-xp-lenovo-ix4-300d: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 28/39] ARM: dts: armada-xp-matrix: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 29/39] ARM: dts: armada-xp-mv78230: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 30/39] ARM: dts: armada-xp-mv78260: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 31/39] ARM: dts: armada-xp-mv78460: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 32/39] ARM: dts: armada-xp-netgear-rn2120: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 33/39] ARM: dts: armada-xp-openblocks-ax3-4: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 34/39] ARM: dts: armada-xp-synology-ds414: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 35/39] ARM: dts: dove-cm-a510: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 36/39] ARM: dts: dove-sbc-a510: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 37/39] ARM: dts: kirkwood-linkstation: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 38/39] ARM: dts: orion5x-kuroboxpro: " Alexandre Belloni
2016-12-14 22:37 ` [PATCH 39/39] ARM: dts: orion5x-lswsgl: " Alexandre Belloni
2016-12-15  6:01 ` [PATCH 00/39] ARM: dts: mvebu: Fix " Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161214223746.23066-9-alexandre.belloni@free-electrons.com \
    --to=alexandre.belloni@free-electrons.com \
    --cc=andrew@lunn.ch \
    --cc=arno@natisbad.org \
    --cc=boris.brezillon@free-electrons.com \
    --cc=gregory.clement@free-electrons.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sr@denx.de \
    --cc=thomas.petazzoni@free-electrons.com \
    --cc=zajec5@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).