On Wed, Dec 14, 2016 at 11:37:10PM +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: Arnaud Ebalard <a...@natisbad.org> > Cc: Ben Dooks <ben.do...@codethink.co.uk> > Cc: Boris Brezillon <boris.brezil...@free-electrons.com> > Cc: Ezequiel Garcia <ezequiel.gar...@free-electrons.com> > Cc: Lior Amsalem <al...@marvell.com> > Cc: Ryan Press <r...@presslab.us> > Cc: Simon Guinot <simon.gui...@sequanux.org> > Cc: Stefan Roese <s...@denx.de> > Cc: Thomas Petazzoni <thomas.petazz...@free-electrons.com> > Cc: Uwe Kleine-König <u.kleine-koe...@pengutronix.de> Acked-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
> Cc: Yehuda Yitschak <yehu...@marvell.com> > Signed-off-by: Alexandre Belloni <alexandre.bell...@free-electrons.com> > --- > arch/arm/boot/dts/armada-370.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-370.dtsi > b/arch/arm/boot/dts/armada-370.dtsi > index b4258105e91f..c057c54f6b36 100644 > --- a/arch/arm/boot/dts/armada-370.dtsi > +++ b/arch/arm/boot/dts/armada-370.dtsi > @@ -17,17 +17,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 > @@ -36,11 +36,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 > > -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |