diff options
author | 2018-12-17 10:57:20 -0500 | |
---|---|---|
committer | 2018-12-17 10:57:20 -0500 | |
commit | e7121ab4056ff3419f981bbf03c1e7db39223149 (patch) | |
tree | f1d892ec5f018b749f03c9848deaaf15b4b37464 /Documentation/media/uapi/v4l/bayer.svg | |
parent | Merge tag 'v4.20-rc7' into patchwork (diff) | |
download | linux-dev-e7121ab4056ff3419f981bbf03c1e7db39223149.tar.xz linux-dev-e7121ab4056ff3419f981bbf03c1e7db39223149.zip |
media: docs: fix some GPL licensing ambiguity at the text
Those files are meant to be dual GPL 2.0 and GFDL without
implicit sections. However, by a wrong cut-and-paste, I ended
by applying a GPL 2+ license text to it, while still using the
GPL 2.0 SPDX tag, with would cause an ambiguity about the
licensing model.
Solve this by explicitly mentioning that the dual licensing
is between GPL 2.0 and GFDL and correcting the text.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'Documentation/media/uapi/v4l/bayer.svg')
-rw-r--r-- | Documentation/media/uapi/v4l/bayer.svg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/media/uapi/v4l/bayer.svg b/Documentation/media/uapi/v4l/bayer.svg index abec45b7873b..c5bf85103901 100644 --- a/Documentation/media/uapi/v4l/bayer.svg +++ b/Documentation/media/uapi/v4l/bayer.svg @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- This file is dual-licensed: you can use it either under the terms - of the GPL or the GFDL 1.1+ license, at your option. Note that this + of the GPL 2.0 or the GFDL 1.1+ 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. + published by the Free Software Foundation version 2 of + the License. This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |