Module Name: src
Committed By: snj
Date: Fri Oct 23 02:32:34 UTC 2009
Modified Files:
src/sys/arch/next68k/dev: bmapreg.h if_xereg.h
src/sys/arch/xen/i386: npx_hv.c
src/sys/arch/xen/include: evtchn.h if_xennetvar.h kernfs_machdep.h
xbdvar.h xenfunc.h xenpmap.h
src/sys/arch/xen/x86: hypervisor_machdep.c x86_xpmap.c xenfunc.c
src/sys/arch/xen/xen: clock.c hypervisor.c if_xennet_xenbus.c privcmd.c
xen_debug.c xen_machdep.c xencons.c
src/sys/nfs: nfs_bootstatic.c
Log Message:
Remove 3rd and 4th clauses. OK cl@ (copyright holder).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/next68k/dev/bmapreg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/next68k/dev/if_xereg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/i386/npx_hv.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/include/evtchn.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/include/if_xennetvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/xen/include/kernfs_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/xen/include/xbdvar.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/include/xenfunc.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/x86/xenfunc.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/xen/if_xennet_xenbus.c \
src/sys/arch/xen/xen/privcmd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/xen/xen_debug.c \
src/sys/arch/xen/xen/xen_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/xen/xen/xencons.c
cvs rdiff -u -r1.7 -r1.8 src/sys/nfs/nfs_bootstatic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/next68k/dev/bmapreg.h
diff -u src/sys/arch/next68k/dev/bmapreg.h:1.2 src/sys/arch/next68k/dev/bmapreg.h:1.3
--- src/sys/arch/next68k/dev/bmapreg.h:1.2 Wed Sep 11 01:46:30 2002
+++ src/sys/arch/next68k/dev/bmapreg.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bmapreg.h,v 1.2 2002/09/11 01:46:30 mycroft Exp $ */
+/* $NetBSD: bmapreg.h,v 1.3 2009/10/23 02:32:33 snj Exp $ */
/*
* Copyright (c) 2002 Christian Limpach
@@ -12,11 +12,6 @@
* 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 Christian Limpach
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/next68k/dev/if_xereg.h
diff -u src/sys/arch/next68k/dev/if_xereg.h:1.1 src/sys/arch/next68k/dev/if_xereg.h:1.2
--- src/sys/arch/next68k/dev/if_xereg.h:1.1 Wed Sep 11 01:46:31 2002
+++ src/sys/arch/next68k/dev/if_xereg.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xereg.h,v 1.1 2002/09/11 01:46:31 mycroft Exp $ */
+/* $NetBSD: if_xereg.h,v 1.2 2009/10/23 02:32:33 snj Exp $ */
/*
* Copyright (c) 2002 Christian Limpach
@@ -12,11 +12,6 @@
* 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 Christian Limpach
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/i386/npx_hv.c
diff -u src/sys/arch/xen/i386/npx_hv.c:1.7 src/sys/arch/xen/i386/npx_hv.c:1.8
--- src/sys/arch/xen/i386/npx_hv.c:1.7 Fri Oct 24 18:02:58 2008
+++ src/sys/arch/xen/i386/npx_hv.c Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_hv.c,v 1.7 2008/10/24 18:02:58 jym Exp $ */
+/* $NetBSD: npx_hv.c,v 1.8 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -33,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1.7 2008/10/24 18:02:58 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1.8 2009/10/23 02:32:33 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/xen/include/evtchn.h
diff -u src/sys/arch/xen/include/evtchn.h:1.17 src/sys/arch/xen/include/evtchn.h:1.18
--- src/sys/arch/xen/include/evtchn.h:1.17 Fri Oct 24 21:09:24 2008
+++ src/sys/arch/xen/include/evtchn.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.h,v 1.17 2008/10/24 21:09:24 jym Exp $ */
+/* $NetBSD: evtchn.h,v 1.18 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/include/if_xennetvar.h
diff -u src/sys/arch/xen/include/if_xennetvar.h:1.13 src/sys/arch/xen/include/if_xennetvar.h:1.14
--- src/sys/arch/xen/include/if_xennetvar.h:1.13 Wed Apr 16 18:41:48 2008
+++ src/sys/arch/xen/include/if_xennetvar.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennetvar.h,v 1.13 2008/04/16 18:41:48 cegger Exp $ */
+/* $NetBSD: if_xennetvar.h,v 1.14 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/include/kernfs_machdep.h
diff -u src/sys/arch/xen/include/kernfs_machdep.h:1.2 src/sys/arch/xen/include/kernfs_machdep.h:1.3
--- src/sys/arch/xen/include/kernfs_machdep.h:1.2 Sun Dec 11 12:19:48 2005
+++ src/sys/arch/xen/include/kernfs_machdep.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_machdep.h,v 1.2 2005/12/11 12:19:48 christos Exp $ */
+/* $NetBSD: kernfs_machdep.h,v 1.3 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/include/xbdvar.h
diff -u src/sys/arch/xen/include/xbdvar.h:1.11 src/sys/arch/xen/include/xbdvar.h:1.12
--- src/sys/arch/xen/include/xbdvar.h:1.11 Wed Apr 16 18:41:48 2008
+++ src/sys/arch/xen/include/xbdvar.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdvar.h,v 1.11 2008/04/16 18:41:48 cegger Exp $ */
+/* $NetBSD: xbdvar.h,v 1.12 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/include/xenfunc.h
diff -u src/sys/arch/xen/include/xenfunc.h:1.14 src/sys/arch/xen/include/xenfunc.h:1.15
--- src/sys/arch/xen/include/xenfunc.h:1.14 Fri Jan 11 20:00:42 2008
+++ src/sys/arch/xen/include/xenfunc.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xenfunc.h,v 1.14 2008/01/11 20:00:42 bouyer Exp $ */
+/* $NetBSD: xenfunc.h,v 1.15 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.23 src/sys/arch/xen/include/xenpmap.h:1.24
--- src/sys/arch/xen/include/xenpmap.h:1.23 Wed Jul 29 12:02:06 2009
+++ src/sys/arch/xen/include/xenpmap.h Fri Oct 23 02:32:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xenpmap.h,v 1.23 2009/07/29 12:02:06 cegger Exp $ */
+/* $NetBSD: xenpmap.h,v 1.24 2009/10/23 02:32:33 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/xen/x86/hypervisor_machdep.c
diff -u src/sys/arch/xen/x86/hypervisor_machdep.c:1.12 src/sys/arch/xen/x86/hypervisor_machdep.c:1.13
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.12 Wed Jul 29 12:02:08 2009
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.12 2009/07/29 12:02:08 cegger Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.13 2009/10/23 02:32:34 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,7 +54,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.12 2009/07/29 12:02:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.13 2009/10/23 02:32:34 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.16 src/sys/arch/xen/x86/x86_xpmap.c:1.17
--- src/sys/arch/xen/x86/x86_xpmap.c:1.16 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/x86/x86_xpmap.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.16 2009/10/19 18:41:11 bouyer Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.17 2009/10/23 02:32:34 snj Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <m...@adviseo.fr>
@@ -54,11 +54,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -74,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.16 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.17 2009/10/23 02:32:34 snj Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
Index: src/sys/arch/xen/x86/xenfunc.c
diff -u src/sys/arch/xen/x86/xenfunc.c:1.8 src/sys/arch/xen/x86/xenfunc.c:1.9
--- src/sys/arch/xen/x86/xenfunc.c:1.8 Wed Jul 29 12:02:08 2009
+++ src/sys/arch/xen/x86/xenfunc.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xenfunc.c,v 1.8 2009/07/29 12:02:08 cegger Exp $ */
+/* $NetBSD: xenfunc.c,v 1.9 2009/10/23 02:32:34 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.8 2009/07/29 12:02:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.9 2009/10/23 02:32:34 snj Exp $");
#include <sys/param.h>
Index: src/sys/arch/xen/xen/clock.c
diff -u src/sys/arch/xen/xen/clock.c:1.51 src/sys/arch/xen/xen/clock.c:1.52
--- src/sys/arch/xen/xen/clock.c:1.51 Wed Jul 29 12:02:09 2009
+++ src/sys/arch/xen/xen/clock.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.51 2009/07/29 12:02:09 cegger Exp $ */
+/* $NetBSD: clock.c,v 1.52 2009/10/23 02:32:34 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -34,7 +29,7 @@
#include "opt_xen.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.51 2009/07/29 12:02:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.52 2009/10/23 02:32:34 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.49 src/sys/arch/xen/xen/hypervisor.c:1.50
--- src/sys/arch/xen/xen/hypervisor.c:1.49 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/xen/hypervisor.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.49 2009/10/19 18:41:11 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.50 2009/10/23 02:32:34 snj Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -38,11 +38,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -58,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.49 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.50 2009/10/23 02:32:34 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.38 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.39
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.38 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.38 2009/10/19 18:41:11 bouyer Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.39 2009/10/23 02:32:34 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -37,11 +37,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -90,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.38 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.39 2009/10/23 02:32:34 snj Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
Index: src/sys/arch/xen/xen/privcmd.c
diff -u src/sys/arch/xen/xen/privcmd.c:1.38 src/sys/arch/xen/xen/privcmd.c:1.39
--- src/sys/arch/xen/xen/privcmd.c:1.38 Wed Jul 29 12:02:09 2009
+++ src/sys/arch/xen/xen/privcmd.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: privcmd.c,v 1.38 2009/07/29 12:02:09 cegger Exp $ */
+/* $NetBSD: privcmd.c,v 1.39 2009/10/23 02:32:34 snj Exp $ */
/*-
* Copyright (c) 2004 Christian Limpach.
@@ -12,11 +12,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,7 +27,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.38 2009/07/29 12:02:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.39 2009/10/23 02:32:34 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/xen/xen/xen_debug.c
diff -u src/sys/arch/xen/xen/xen_debug.c:1.6 src/sys/arch/xen/xen/xen_debug.c:1.7
--- src/sys/arch/xen/xen/xen_debug.c:1.6 Wed Mar 18 10:22:39 2009
+++ src/sys/arch/xen/xen/xen_debug.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_debug.c,v 1.6 2009/03/18 10:22:39 cegger Exp $ */
+/* $NetBSD: xen_debug.c,v 1.7 2009/10/23 02:32:34 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -56,7 +51,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_debug.c,v 1.6 2009/03/18 10:22:39 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_debug.c,v 1.7 2009/10/23 02:32:34 snj Exp $");
#define XENDEBUG
Index: src/sys/arch/xen/xen/xen_machdep.c
diff -u src/sys/arch/xen/xen/xen_machdep.c:1.6 src/sys/arch/xen/xen/xen_machdep.c:1.7
--- src/sys/arch/xen/xen/xen_machdep.c:1.6 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/xen/xen_machdep.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_machdep.c,v 1.6 2009/10/19 18:41:11 bouyer Exp $ */
+/* $NetBSD: xen_machdep.c,v 1.7 2009/10/23 02:32:34 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -38,11 +38,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -58,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.6 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.7 2009/10/23 02:32:34 snj Exp $");
#include "opt_xen.h"
Index: src/sys/arch/xen/xen/xencons.c
diff -u src/sys/arch/xen/xen/xencons.c:1.34 src/sys/arch/xen/xen/xencons.c:1.35
--- src/sys/arch/xen/xen/xencons.c:1.34 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/xen/xencons.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xencons.c,v 1.34 2009/10/19 18:41:11 bouyer Exp $ */
+/* $NetBSD: xencons.c,v 1.35 2009/10/23 02:32:34 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -38,11 +38,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -58,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.34 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.35 2009/10/23 02:32:34 snj Exp $");
#include "opt_xen.h"
Index: src/sys/nfs/nfs_bootstatic.c
diff -u src/sys/nfs/nfs_bootstatic.c:1.7 src/sys/nfs/nfs_bootstatic.c:1.8
--- src/sys/nfs/nfs_bootstatic.c:1.7 Wed Nov 19 18:36:09 2008
+++ src/sys/nfs/nfs_bootstatic.c Fri Oct 23 02:32:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bootstatic.c,v 1.7 2008/11/19 18:36:09 ad Exp $ */
+/* $NetBSD: nfs_bootstatic.c,v 1.8 2009/10/23 02:32:34 snj Exp $ */
/*
*
@@ -13,11 +13,6 @@
* 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 Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -33,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bootstatic.c,v 1.7 2008/11/19 18:36:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bootstatic.c,v 1.8 2009/10/23 02:32:34 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs_boot.h"
