diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-04-25 22:30:22 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-28 00:39:43 +0200 |
| commit | 01cf721b16c83d2645348c2c01473a8dec6e0cb4 (patch) | |
| tree | c0dadeacae6b918d3eb75a0ddf5dab6280ca3447 /LICENSES | |
| parent | LICENSES/GPL2.0: Add GPL-2.0-only/or-later as valid identifiers (diff) | |
| download | linux-01cf721b16c83d2645348c2c01473a8dec6e0cb4.tar.xz linux-01cf721b16c83d2645348c2c01473a8dec6e0cb4.zip | |
LICENSES: Add X11 license
Add the full text of the X11 to the kernel tree. It was copied directly
from:
https://spdx.org/licenses/X11.html#licenseText
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'LICENSES')
| -rw-r--r-- | LICENSES/other/X11 | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/LICENSES/other/X11 b/LICENSES/other/X11 new file mode 100644 index 000000000000..fe4353fd0000 --- /dev/null +++ b/LICENSES/other/X11 @@ -0,0 +1,37 @@ +Valid-License-Identifier: X11 +SPDX-URL: https://spdx.org/licenses/X11.html +Usage-Guide: + To use the X11 put the following SPDX tag/value pair into a comment + according to the placement guidelines in the licensing rules + documentation: + SPDX-License-Identifier: X11 +License-Text: + + +X11 License + +Copyright (C) 1996 X Consortium + +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 +X CONSORTIUM 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. + +Except as contained in this notice, the name of the X Consortium shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from the X +Consortium. + +X Window System is a trademark of X Consortium, Inc. |