From: marcel.ziswiler@toradex•com (Marcel Ziswiler)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 08/37] ARM: dts: imx6q-apalis-ixora: Correct license text
Date: Thu, 15 Dec 2016 07:49:29 +0000 [thread overview]
Message-ID: <1481788168.2845.1.camel@toradex.com> (raw)
In-Reply-To: <20161214235746.7108-9-alexandre.belloni@free-electrons.com>
On Thu, 2016-12-15 at 00:57 +0100, Alexandre Belloni wrote:
> 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: Bjorn Helgaas <bhelgaas@google•com>
> Cc: Juergen Borleis <jbe@pengutronix•de>
> Cc: Lucas Stach <l.stach@pengutronix•de>
> Cc: Marcel Ziswiler <marcel.ziswiler@toradex•com>
> Cc: Petr ?tetiar <ynezz@true•cz>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-
> electrons.com>
Acked-by:?Marcel Ziswiler <marcel.ziswiler@toradex•com>
> ---
> ?arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 +++++-----
> ?1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> index 207b85b91ada..97b9b53a5086 100644
> --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> @@ -12,17 +12,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
> @@ -31,11 +31,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.
next prev parent reply other threads:[~2016-12-15 7:49 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20161214235746.7108-1-alexandre.belloni@free-electrons.com>
2016-12-14 23:57 ` [PATCH 01/37] ARM: dts: imx6dl-aristainetos2: Correct license text Alexandre Belloni
2016-12-15 5:29 ` Heiko Schocher
2016-12-15 17:27 ` Rask Ingemann Lambertsen
2016-12-14 23:57 ` [PATCH 02/37] ARM: dts: imx6*-cubox-i: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 03/37] ARM: dts: imx6*-hummingboard: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 04/37] ARM: dts: imx6dl-nit6xlite: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 05/37] ARM: dts: imx6*-nitrogen6x: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 06/37] ARM: dts: imx6dl-sabrelite: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 07/37] ARM: dts: imx6dl-ts4900: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 08/37] ARM: dts: imx6q-apalis-ixora: " Alexandre Belloni
2016-12-15 7:49 ` Marcel Ziswiler [this message]
2016-12-14 23:57 ` [PATCH 09/37] ARM: dts: imx6q-b450v3: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 10/37] ARM: dts: imx6q-b650v3: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 11/37] ARM: dts: imx6q-b850v3: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 12/37] ARM: dts: imx6q-ba16: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 13/37] ARM: dts: imx6q-bx50v3: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 14/37] ARM: dts: imx6q-cm-fx6: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 15/37] ARM: dts: imx6qdl-apalis: " Alexandre Belloni
2016-12-15 7:49 ` Marcel Ziswiler
2016-12-14 23:57 ` [PATCH 16/37] ARM: dts: imx6qdl-icore-rqs: " Alexandre Belloni
2017-01-02 8:21 ` Michael Trimarchi
2016-12-14 23:57 ` [PATCH 17/37] ARM: dts: imx6*-microsom: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 18/37] ARM: dts: imx6qdl-nit6xlite: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 19/37] ARM: dts: imx6*-nitrogen6_max: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 20/37] ARM: dts: imx6*-sabrelite: " Alexandre Belloni
2016-12-15 8:01 ` Uwe Kleine-König
2016-12-14 23:57 ` [PATCH 21/37] ARM: dts: imx6qdl-ts4900: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 22/37] ARM: dts: imx6q-h100: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 23/37] ARM: dts: imx6q-icore-rqs: " Alexandre Belloni
2017-01-02 8:22 ` Michael Trimarchi
2016-12-14 23:57 ` [PATCH 24/37] ARM: dts: imx6q-marsboard: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 25/37] ARM: dts: imx6q-ts4900: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 26/37] ARM: dts: imx6sx-nitrogen6sx: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 27/37] ARM: dts: imx6sx-sdb-sai: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 28/37] ARM: dts: imx6ul-geam: " Alexandre Belloni
2017-01-02 8:23 ` Michael Trimarchi
2016-12-14 23:57 ` [PATCH 29/37] ARM: dts: imx6ul-pico-hobbit: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 30/37] ARM: dts: vf*-colibri: " Alexandre Belloni
2017-01-02 16:51 ` Stefan Agner
2016-12-14 23:57 ` [PATCH 31/37] ARM: dts: vf500: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 32/37] ARM: dts: vf610: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 33/37] ARM: dts: vf610m4-cosmic: " Alexandre Belloni
2016-12-15 13:24 ` Afzal Mohammed
2016-12-14 23:57 ` [PATCH 34/37] ARM: dts: vf610m4: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 35/37] ARM: dts: vf610-twr: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 36/37] ARM: dts: vf610-zii-dev-rev-b: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 37/37] ARM: dts: vfxxx: " Alexandre Belloni
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=1481788168.2845.1.camel@toradex.com \
--to=marcel.ziswiler@toradex$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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