Re: [PATCH] ARM: dts: tegra124-apalis: Correct license text

[Marcel Ziswiler]

On Thu, 2016-12-15 at 01:04 +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: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-
> electrons.com>

Acked-by: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>

> ---
> Âarch/arm/boot/dts/tegra124-apalis-emc.dtsi | 10 +++++-----
> Âarch/arm/boot/dts/tegra124-apalis-eval.dts | 10 +++++-----
> Âarch/arm/boot/dts/tegra124-apalis.dtsiÂÂÂÂÂ| 10 +++++-----
> Â3 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> index ca2c3a557895..0e3013ff6c63 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> @@ -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.
> diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts
> b/arch/arm/boot/dts/tegra124-apalis-eval.dts
> index 653044a44f0d..dec449f7b574 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
> +++ b/arch/arm/boot/dts/tegra124-apalis-eval.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.
> diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
> b/arch/arm/boot/dts/tegra124-apalis.dtsi
> index e7a73db17613..fa96556f5a45 100644
> --- a/arch/arm/boot/dts/tegra124-apalis.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
> @@ -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.