* [PATCH] ARM: dts: artpec: dual-license on artpec6.dtsi
@ 2016-02-25 9:11 Lars Persson
2016-03-13 0:11 ` Olof Johansson
0 siblings, 1 reply; 2+ messages in thread
From: Lars Persson @ 2016-02-25 9:11 UTC (permalink / raw)
To: linux-arm-kernel
Relaxed the license on the dtsi to permit use in other projects.
Signed-off-by: Lars Persson <larper@axis.com>
---
arch/arm/boot/dts/artpec6.dtsi | 40 +++++++++++++++++++++++++++++++++++++---
1 file changed, 37 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/artpec6.dtsi b/arch/arm/boot/dts/artpec6.dtsi
index f2a7e4a..3043016 100644
--- a/arch/arm/boot/dts/artpec6.dtsi
+++ b/arch/arm/boot/dts/artpec6.dtsi
@@ -1,9 +1,43 @@
/*
* Device Tree Source for the Axis ARTPEC-6 SoC
*
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * 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,
+ * 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,
+ *
+ * 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,
+ * 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
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 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,
+ * 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.
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: dts: artpec: dual-license on artpec6.dtsi
2016-02-25 9:11 [PATCH] ARM: dts: artpec: dual-license on artpec6.dtsi Lars Persson
@ 2016-03-13 0:11 ` Olof Johansson
0 siblings, 0 replies; 2+ messages in thread
From: Olof Johansson @ 2016-03-13 0:11 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 25, 2016 at 10:11:56AM +0100, Lars Persson wrote:
> Relaxed the license on the dtsi to permit use in other projects.
>
> Signed-off-by: Lars Persson <larper@axis.com>
> ---
> arch/arm/boot/dts/artpec6.dtsi | 40 +++++++++++++++++++++++++++++++++++++---
> 1 file changed, 37 insertions(+), 3 deletions(-)
Applied, thanks for following up with this!
-Olof
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-13 0:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-25 9:11 [PATCH] ARM: dts: artpec: dual-license on artpec6.dtsi Lars Persson
2016-03-13 0:11 ` Olof Johansson
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).