PERFORCE change 112833 for review
Paolo Pisati
piso at FreeBSD.org
Fri Jan 12 13:10:28 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=112833
Change 112833 by piso at piso_newluxor on 2007/01/12 21:10:11
Sync with HEAD.
Affected files ...
.. //depot/projects/soc2006/intr_filter/sun4v/include/reloc.h#2 edit
.. //depot/projects/soc2006/intr_filter/sun4v/include/setjmp.h#2 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/sun4v/include/reloc.h#2 (text+ko) ====
@@ -10,10 +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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
+ * 3. Neither the name of the author nor the names of any co-contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -29,5 +26,5 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sun4v/include/reloc.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
+ * $FreeBSD: src/sys/sun4v/include/reloc.h,v 1.2 2007/01/12 07:19:22 imp Exp $
*/
==== //depot/projects/soc2006/intr_filter/sun4v/include/setjmp.h#2 (text+ko) ====
@@ -10,10 +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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
+ * 3. Neither the name of the author nor the names of any co-contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -30,7 +27,7 @@
* SUCH DAMAGE.
*
* From: FreeBSD: src/sys/i386/include/setjmp.h,v 1.5 2000/10/06
- * $FreeBSD: src/sys/sun4v/include/setjmp.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
+ * $FreeBSD: src/sys/sun4v/include/setjmp.h,v 1.2 2007/01/12 07:19:22 imp Exp $
*/
#ifndef _MACHINE_SETJMP_H_
More information about the p4-projects
mailing list