summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-03-11 17:20:50 +0000
committerimp <imp@FreeBSD.org>2014-03-11 17:20:50 +0000
commitc4c8568cd0660852b49f15c2525b6d0123b022b3 (patch)
tree0a948d42c654b30bd2040bbb954c45947e0c4c4f
parent5b0f783476be89676d65cc571edf224bd43eb930 (diff)
downloadFreeBSD-src-c4c8568cd0660852b49f15c2525b6d0123b022b3.zip
FreeBSD-src-c4c8568cd0660852b49f15c2525b6d0123b022b3.tar.gz
Remove clause 3 (the advertising clause), per the regent's letter.
-rw-r--r--sys/amd64/amd64/sys_machdep.c2
-rw-r--r--sys/i386/i386/sys_machdep.c2
-rw-r--r--sys/mips/mips/sys_machdep.c6
3 files changed, 3 insertions, 7 deletions
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 81ac0e3..3561c16 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 746f846..836423d 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/mips/mips/sys_machdep.c b/sys/mips/mips/sys_machdep.c
index 4784104..5cd5366 100644
--- a/sys/mips/mips/sys_machdep.c
+++ b/sys/mips/mips/sys_machdep.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
OpenPOWER on IntegriCloud