All of lore.kernel.org
 help / color / mirror / Atom feed
From: rogershimizu@gmail.com (Roger Shimizu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11
Date: Thu, 21 Jan 2016 00:33:56 +0900	[thread overview]
Message-ID: <1453304038-28345-6-git-send-email-rogershimizu@gmail.com> (raw)
In-Reply-To: <1453304038-28345-1-git-send-email-rogershimizu@gmail.com>

Signed-off-by: Roger Shimizu <rogershimizu@gmail.com>
---
 arch/arm/boot/dts/kirkwood-lswvl.dts | 41 ++++++++++++++++++++++++++++++++----
 arch/arm/boot/dts/kirkwood-lswxl.dts | 41 ++++++++++++++++++++++++++++++++----
 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/kirkwood-lswvl.dts b/arch/arm/boot/dts/kirkwood-lswvl.dts
index 20b6b0c8b3ec..59ac94cc93e9 100644
--- a/arch/arm/boot/dts/kirkwood-lswvl.dts
+++ b/arch/arm/boot/dts/kirkwood-lswvl.dts
@@ -4,10 +4,43 @@
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.com>
  *
- * This program 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 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 , 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts
index f4700a60065b..5bc0b597c9c2 100644
--- a/arch/arm/boot/dts/kirkwood-lswxl.dts
+++ b/arch/arm/boot/dts/kirkwood-lswxl.dts
@@ -4,10 +4,43 @@
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.com>
  *
- * This program 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 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 , 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.
  */
 
 /dts-v1/;
-- 
2.1.4

  parent reply	other threads:[~2016-01-20 15:33 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-19 13:49 [PATCH 0/2] ARM: dts: kirkwood: split lswxl and lswvl with fixes Roger Shimizu
2016-01-19 13:49 ` [PATCH 1/2] ARM: dts: kirkwood: split lswxl into linkstation lswsxl and lswxl Roger Shimizu
2016-01-19 14:05   ` Andrew Lunn
2016-01-19 14:15     ` Roger Shimizu
2016-01-19 14:48       ` Andrew Lunn
2016-01-19 14:56         ` Roger Shimizu
2016-01-20  1:08   ` Andrew Lunn
2016-01-19 13:49 ` [PATCH 2/2] ARM: dts: kirkwood: split lswvl into linkstation lsvl and lswvl Roger Shimizu
2016-01-20 15:33 ` [PATCH v2 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu
2016-01-20 15:33   ` [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu
2016-01-20 17:11     ` Andrew Lunn
2016-01-20 15:33   ` [PATCH v2 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu
2016-01-20 17:12     ` Andrew Lunn
2016-01-20 15:33   ` [PATCH v2 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu
2016-01-20 17:16     ` Andrew Lunn
2016-01-21  0:16       ` Roger Shimizu
2016-01-21  0:30     ` Andrew Lunn
2016-01-20 15:33   ` [PATCH v2 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu
2016-01-21  0:31     ` Andrew Lunn
2016-01-20 15:33   ` Roger Shimizu [this message]
2016-01-20 17:18     ` [PATCH v2 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Andrew Lunn
2016-01-20 15:33   ` [PATCH v2 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu
2016-01-20 17:21     ` Sebastian Hesselbarth
2016-01-21 15:06       ` Roger Shimizu
2016-01-21  0:36     ` Andrew Lunn
2016-01-20 15:33   ` [PATCH v2 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu
2016-01-21  0:37     ` Andrew Lunn
2016-01-21 14:38 ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 2/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 3/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 4/7] ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 5/7] ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11 Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 6/7] ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl Roger Shimizu
2016-01-21 14:38   ` [PATCH v3 7/7] ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl Roger Shimizu
2016-01-21 16:00   ` [PATCH v3 0/7] ARM: dts: kirkwood: fixes and split of linkstation dts for ls-wvl/vl and ls-wxl/wsxl Gregory CLEMENT
2016-01-21 16:05     ` Roger Shimizu
2016-01-21 16:18       ` Gregory CLEMENT
2016-01-21 16:23         ` Roger Shimizu
2016-01-25 15:17   ` Gregory CLEMENT

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=1453304038-28345-6-git-send-email-rogershimizu@gmail.com \
    --to=rogershimizu@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.