svn commit: r266312 - in stable/10/sys: amd64/amd64 arm/arm i386/i386 ia64/ia64 mips/mips powerpc/powerpc sparc64/sparc64

[Ian Lepore]

Author: ian
Date: Sat May 17 13:59:11 2014
New Revision: 266312
URL: http://svnweb.freebsd.org/changeset/base/266312

Log:
  MFC 263036, 263059: delete advertising clause in licenses, renumber.

Modified:
  stable/10/sys/amd64/amd64/uio_machdep.c
  stable/10/sys/arm/arm/sys_machdep.c
  stable/10/sys/arm/arm/uio_machdep.c
  stable/10/sys/i386/i386/uio_machdep.c
  stable/10/sys/ia64/ia64/uio_machdep.c
  stable/10/sys/mips/mips/uio_machdep.c
  stable/10/sys/powerpc/powerpc/uio_machdep.c
  stable/10/sys/sparc64/sparc64/uio_machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/uio_machdep.c
==============================================================================
--- stable/10/sys/amd64/amd64/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/amd64/amd64/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,7 +16,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.
  *

Modified: stable/10/sys/arm/arm/sys_machdep.c
==============================================================================
--- stable/10/sys/arm/arm/sys_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/arm/arm/sys_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -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.
  *

Modified: stable/10/sys/arm/arm/uio_machdep.c
==============================================================================
--- stable/10/sys/arm/arm/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/arm/arm/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,11 +16,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.
  *

Modified: stable/10/sys/i386/i386/uio_machdep.c
==============================================================================
--- stable/10/sys/i386/i386/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/i386/i386/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,7 +16,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.
  *

Modified: stable/10/sys/ia64/ia64/uio_machdep.c
==============================================================================
--- stable/10/sys/ia64/ia64/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/ia64/ia64/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,7 +16,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.
  *

Modified: stable/10/sys/mips/mips/uio_machdep.c
==============================================================================
--- stable/10/sys/mips/mips/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/mips/mips/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,7 +16,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.
  *

Modified: stable/10/sys/powerpc/powerpc/uio_machdep.c
==============================================================================
--- stable/10/sys/powerpc/powerpc/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/powerpc/powerpc/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,7 +16,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.
  *

Modified: stable/10/sys/sparc64/sparc64/uio_machdep.c
==============================================================================
--- stable/10/sys/sparc64/sparc64/uio_machdep.c	Sat May 17 13:53:38 2014	(r266311)
+++ stable/10/sys/sparc64/sparc64/uio_machdep.c	Sat May 17 13:59:11 2014	(r266312)
@@ -16,7 +16,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.
  *