[PATCH] ARM: dts: tegra124-apalis: Correct license text
flat view
From: Marcel Ziswiler <hidden>
Date: 2016-12-15 08:23:43
Also in:
lkml
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 <redacted> Signed-off-by: Alexandre Belloni <alexandre.belloni@free- electrons.com>
Acked-by: Marcel Ziswiler <redacted>
quoted hunk ↗ jump to hunk
--- ?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.dtsib/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.dtsb/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.dtsib/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.