Jordan Justen
2012-Jul-30 21:20 UTC
[syslinux] [PATCH] efilinux: convert from 3-clause BSD to 2-clause BSD license
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com> --- Makefile | 3 --- efilinux.h | 4 ---- entry.c | 4 ---- fs/fs.c | 4 ---- fs/fs.h | 4 ---- loaders/bzimage/bzimage.c | 4 ---- loaders/bzimage/bzimage.h | 4 ---- loaders/bzimage/graphics.c | 4 ---- loaders/bzimage/i386.h | 4 ---- loaders/bzimage/x86_64.h | 4 ---- loaders/loader.h | 4 ---- malloc.c | 4 ---- protocol.h | 4 ---- 13 files changed, 51 deletions(-) diff --git a/Makefile b/Makefile index 3b02abe..a955e34 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,6 @@ # copyright notice, this list of conditions and the following # disclaimer in the documentation and/or other materials provided # with the distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/efilinux.h b/efilinux.h index 9ca320f..dcbcb29 100644 --- a/efilinux.h +++ b/efilinux.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/entry.c b/entry.c index b5155af..0aa6cdd 100644 --- a/entry.c +++ b/entry.c @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/fs/fs.c b/fs/fs.c index 477afd1..36a75f8 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/fs/fs.h b/fs/fs.h index 4a6c71f..9223b79 100644 --- a/fs/fs.h +++ b/fs/fs.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/loaders/bzimage/bzimage.c b/loaders/bzimage/bzimage.c index d323874..3b9c560 100644 --- a/loaders/bzimage/bzimage.c +++ b/loaders/bzimage/bzimage.c @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/loaders/bzimage/bzimage.h b/loaders/bzimage/bzimage.h index 448fff1..9d84725 100644 --- a/loaders/bzimage/bzimage.h +++ b/loaders/bzimage/bzimage.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/loaders/bzimage/graphics.c b/loaders/bzimage/graphics.c index 22a4d81..b14cae1 100644 --- a/loaders/bzimage/graphics.c +++ b/loaders/bzimage/graphics.c @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/loaders/bzimage/i386.h b/loaders/bzimage/i386.h index 3199a02..6f1cf8f 100644 --- a/loaders/bzimage/i386.h +++ b/loaders/bzimage/i386.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/loaders/bzimage/x86_64.h b/loaders/bzimage/x86_64.h index e3e7a33..a7ba3af 100644 --- a/loaders/bzimage/x86_64.h +++ b/loaders/bzimage/x86_64.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/loaders/loader.h b/loaders/loader.h index 2a3d271..7e26eff 100644 --- a/loaders/loader.h +++ b/loaders/loader.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/malloc.c b/malloc.c index 8f2b18c..d10b314 100644 --- a/malloc.c +++ b/malloc.c @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/protocol.h b/protocol.h index 6881d70..2972d5d 100644 --- a/protocol.h +++ b/protocol.h @@ -12,10 +12,6 @@ * notice, this list of conditions and the following disclaimer * in the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- 1.7.11.1
Matt Fleming
2012-Jul-31 12:51 UTC
[syslinux] [PATCH] efilinux: convert from 3-clause BSD to 2-clause BSD license
On Mon, 2012-07-30 at 14:20 -0700, Jordan Justen wrote:> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com> > --- > Makefile | 3 --- > efilinux.h | 4 ---- > entry.c | 4 ---- > fs/fs.c | 4 ---- > fs/fs.h | 4 ---- > loaders/bzimage/bzimage.c | 4 ---- > loaders/bzimage/bzimage.h | 4 ---- > loaders/bzimage/graphics.c | 4 ---- > loaders/bzimage/i386.h | 4 ---- > loaders/bzimage/x86_64.h | 4 ---- > loaders/loader.h | 4 ---- > malloc.c | 4 ---- > protocol.h | 4 ---- > 13 files changed, 51 deletions(-)Fine by me. Applied.