diff --git a/lib/libpuffs/callcontext.c b/lib/libpuffs/callcontext.c
index 934a7c663b69..9409d48a9a10 100644
--- a/lib/libpuffs/callcontext.c
+++ b/lib/libpuffs/callcontext.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: callcontext.c,v 1.6 2007/05/15 13:44:46 pooka Exp $	*/
+/*	$NetBSD: callcontext.c,v 1.7 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006 Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: callcontext.c,v 1.6 2007/05/15 13:44:46 pooka Exp $");
+__RCSID("$NetBSD: callcontext.c,v 1.7 2007/06/06 01:55:00 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/lib/libpuffs/creds.c b/lib/libpuffs/creds.c
index dff9ffa27cec..16a0d75c7b40 100644
--- a/lib/libpuffs/creds.c
+++ b/lib/libpuffs/creds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: creds.c,v 1.9 2007/03/22 17:15:34 pooka Exp $	*/
+/*	$NetBSD: creds.c,v 1.10 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -13,9 +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. The name of the company nor the name of the author may 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
@@ -32,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: creds.c,v 1.9 2007/03/22 17:15:34 pooka Exp $");
+__RCSID("$NetBSD: creds.c,v 1.10 2007/06/06 01:55:00 pooka Exp $");
 #endif /* !lint */
 
 /*
diff --git a/lib/libpuffs/dispatcher.c b/lib/libpuffs/dispatcher.c
index 5fed3d21d283..6c2f34b8af37 100644
--- a/lib/libpuffs/dispatcher.c
+++ b/lib/libpuffs/dispatcher.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dispatcher.c,v 1.5 2007/05/18 18:01:55 pooka Exp $	*/
+/*	$NetBSD: dispatcher.c,v 1.6 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -14,9 +14,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. The name of the company nor the name of the author may 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
@@ -33,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: dispatcher.c,v 1.5 2007/05/18 18:01:55 pooka Exp $");
+__RCSID("$NetBSD: dispatcher.c,v 1.6 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/lib/libpuffs/flush.c b/lib/libpuffs/flush.c
index d229324cf9fb..e56ed11d77d9 100644
--- a/lib/libpuffs/flush.c
+++ b/lib/libpuffs/flush.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: flush.c,v 1.9 2007/04/13 13:35:46 pooka Exp $	*/
+/*	$NetBSD: flush.c,v 1.10 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: flush.c,v 1.9 2007/04/13 13:35:46 pooka Exp $");
+__RCSID("$NetBSD: flush.c,v 1.10 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 /*
diff --git a/lib/libpuffs/null.c b/lib/libpuffs/null.c
index d434d15b0a00..ce5b6275e494 100644
--- a/lib/libpuffs/null.c
+++ b/lib/libpuffs/null.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: null.c,v 1.13 2007/04/12 15:09:01 pooka Exp $	*/
+/*	$NetBSD: null.c,v 1.14 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: null.c,v 1.13 2007/04/12 15:09:01 pooka Exp $");
+__RCSID("$NetBSD: null.c,v 1.14 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 /*
diff --git a/lib/libpuffs/opdump.c b/lib/libpuffs/opdump.c
index f94088c34e06..d86b0749f07a 100644
--- a/lib/libpuffs/opdump.c
+++ b/lib/libpuffs/opdump.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: opdump.c,v 1.9 2007/03/20 10:22:22 pooka Exp $	*/
+/*	$NetBSD: opdump.c,v 1.10 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
@@ -36,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: opdump.c,v 1.9 2007/03/20 10:22:22 pooka Exp $");
+__RCSID("$NetBSD: opdump.c,v 1.10 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <puffs.h>
diff --git a/lib/libpuffs/paths.c b/lib/libpuffs/paths.c
index ea37143f7145..50c12fb0a8c8 100644
--- a/lib/libpuffs/paths.c
+++ b/lib/libpuffs/paths.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: paths.c,v 1.6 2007/05/01 15:58:00 pooka Exp $	*/
+/*	$NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: paths.c,v 1.6 2007/05/01 15:58:00 pooka Exp $");
+__RCSID("$NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/hash.h>
diff --git a/lib/libpuffs/pnode.c b/lib/libpuffs/pnode.c
index b83fad534567..ff2f337e49a4 100644
--- a/lib/libpuffs/pnode.c
+++ b/lib/libpuffs/pnode.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pnode.c,v 1.5 2007/04/12 15:09:01 pooka Exp $	*/
+/*	$NetBSD: pnode.c,v 1.6 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006 Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: pnode.c,v 1.5 2007/04/12 15:09:01 pooka Exp $");
+__RCSID("$NetBSD: pnode.c,v 1.6 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/lib/libpuffs/puffs.c b/lib/libpuffs/puffs.c
index 03aeb9e70f95..e487505e941a 100644
--- a/lib/libpuffs/puffs.c
+++ b/lib/libpuffs/puffs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.c,v 1.51 2007/05/21 08:30:49 pooka Exp $	*/
+/*	$NetBSD: puffs.c,v 1.52 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
@@ -34,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.51 2007/05/21 08:30:49 pooka Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.52 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/param.h>
diff --git a/lib/libpuffs/puffs.h b/lib/libpuffs/puffs.h
index 708d4a966577..d9070bcd3cbf 100644
--- a/lib/libpuffs/puffs.h
+++ b/lib/libpuffs/puffs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.h,v 1.61 2007/05/20 19:56:56 pooka Exp $	*/
+/*	$NetBSD: puffs.h,v 1.62 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
diff --git a/lib/libpuffs/puffs_priv.h b/lib/libpuffs/puffs_priv.h
index faeb6f8da0a3..cef672d328bb 100644
--- a/lib/libpuffs/puffs_priv.h
+++ b/lib/libpuffs/puffs_priv.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_priv.h,v 1.11 2007/05/20 16:24:37 pooka Exp $	*/
+/*	$NetBSD: puffs_priv.h,v 1.12 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006 Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/lib/libpuffs/puffsdump.h b/lib/libpuffs/puffsdump.h
index 4474a96e425d..f01e76363395 100644
--- a/lib/libpuffs/puffsdump.h
+++ b/lib/libpuffs/puffsdump.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffsdump.h,v 1.2 2007/02/18 17:36:48 pooka Exp $	*/
+/*	$NetBSD: puffsdump.h,v 1.3 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -13,9 +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. The name of the company nor the name of the author may 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
diff --git a/lib/libpuffs/requests.c b/lib/libpuffs/requests.c
index e5af05efbbf2..c93536810a72 100644
--- a/lib/libpuffs/requests.c
+++ b/lib/libpuffs/requests.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: requests.c,v 1.7 2007/05/11 21:27:13 pooka Exp $	*/
+/*	$NetBSD: requests.c,v 1.8 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006 Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: requests.c,v 1.7 2007/05/11 21:27:13 pooka Exp $");
+__RCSID("$NetBSD: requests.c,v 1.8 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/lib/libpuffs/subr.c b/lib/libpuffs/subr.c
index b3d2210ad666..7efb32dc785f 100644
--- a/lib/libpuffs/subr.c
+++ b/lib/libpuffs/subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr.c,v 1.16 2007/03/20 18:28:08 pooka Exp $	*/
+/*	$NetBSD: subr.c,v 1.17 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006 Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: subr.c,v 1.16 2007/03/20 18:28:08 pooka Exp $");
+__RCSID("$NetBSD: subr.c,v 1.17 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/lib/libpuffs/suspend.c b/lib/libpuffs/suspend.c
index e6a4af555d6b..9c7cb9c5db4d 100644
--- a/lib/libpuffs/suspend.c
+++ b/lib/libpuffs/suspend.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: suspend.c,v 1.3 2007/04/13 13:35:46 pooka Exp $	*/
+/*	$NetBSD: suspend.c,v 1.4 2007/06/06 01:55:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: suspend.c,v 1.3 2007/04/13 13:35:46 pooka Exp $");
+__RCSID("$NetBSD: suspend.c,v 1.4 2007/06/06 01:55:01 pooka Exp $");
 #endif /* !lint */
 
 /*
diff --git a/share/examples/puffs/dtfs/dtfs.c b/share/examples/puffs/dtfs/dtfs.c
index 5dc2be8cf715..2b6449937852 100644
--- a/share/examples/puffs/dtfs/dtfs.c
+++ b/share/examples/puffs/dtfs/dtfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtfs.c,v 1.27 2007/06/05 12:20:35 pooka Exp $	*/
+/*	$NetBSD: dtfs.c,v 1.28 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/dtfs/dtfs.h b/share/examples/puffs/dtfs/dtfs.h
index c2adb56aa25c..7e68b3ee3d1d 100644
--- a/share/examples/puffs/dtfs/dtfs.h
+++ b/share/examples/puffs/dtfs/dtfs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtfs.h,v 1.16 2007/05/18 13:55:21 pooka Exp $	*/
+/*	$NetBSD: dtfs.h,v 1.17 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/dtfs/dtfs_subr.c b/share/examples/puffs/dtfs/dtfs_subr.c
index 05eb8b4999e8..8cff2b238cc8 100644
--- a/share/examples/puffs/dtfs/dtfs_subr.c
+++ b/share/examples/puffs/dtfs/dtfs_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtfs_subr.c,v 1.15 2007/04/12 15:09:01 pooka Exp $	*/
+/*	$NetBSD: dtfs_subr.c,v 1.16 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/dtfs/dtfs_vfsops.c b/share/examples/puffs/dtfs/dtfs_vfsops.c
index d7789223ec9c..397a105e4fef 100644
--- a/share/examples/puffs/dtfs/dtfs_vfsops.c
+++ b/share/examples/puffs/dtfs/dtfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtfs_vfsops.c,v 1.18 2007/05/18 13:55:21 pooka Exp $	*/
+/*	$NetBSD: dtfs_vfsops.c,v 1.19 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/dtfs/dtfs_vnops.c b/share/examples/puffs/dtfs/dtfs_vnops.c
index 7ddfcffac19a..d596da56864e 100644
--- a/share/examples/puffs/dtfs/dtfs_vnops.c
+++ b/share/examples/puffs/dtfs/dtfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtfs_vnops.c,v 1.27 2007/05/18 15:53:07 pooka Exp $	*/
+/*	$NetBSD: dtfs_vnops.c,v 1.28 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/pnullfs/pnullfs.c b/share/examples/puffs/pnullfs/pnullfs.c
index beb19e580b1b..880b120a633b 100644
--- a/share/examples/puffs/pnullfs/pnullfs.c
+++ b/share/examples/puffs/pnullfs/pnullfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pnullfs.c,v 1.9 2007/05/17 14:13:05 pooka Exp $	*/
+/*	$NetBSD: pnullfs.c,v 1.10 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/rot13fs/rot13fs.c b/share/examples/puffs/rot13fs/rot13fs.c
index 293eebedc2f0..3c14ee310e7a 100644
--- a/share/examples/puffs/rot13fs/rot13fs.c
+++ b/share/examples/puffs/rot13fs/rot13fs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rot13fs.c,v 1.7 2007/05/17 14:13:05 pooka Exp $	*/
+/*	$NetBSD: rot13fs.c,v 1.8 2007/06/06 01:55:02 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/share/examples/puffs/sysctlfs/sysctlfs.c b/share/examples/puffs/sysctlfs/sysctlfs.c
index 5eb47f688637..bf6c170ba23e 100644
--- a/share/examples/puffs/sysctlfs/sysctlfs.c
+++ b/share/examples/puffs/sysctlfs/sysctlfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctlfs.c,v 1.22 2007/05/17 14:13:06 pooka Exp $	*/
+/*	$NetBSD: sysctlfs.c,v 1.23 2007/06/06 01:55:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/sys/fs/puffs/puffs_msgif.c b/sys/fs/puffs/puffs_msgif.c
index 90de41400579..21acf207e2a9 100644
--- a/sys/fs/puffs/puffs_msgif.c
+++ b/sys/fs/puffs/puffs_msgif.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_msgif.c,v 1.37 2007/05/18 15:46:09 pooka Exp $	*/
+/*	$NetBSD: puffs_msgif.c,v 1.38 2007/06/06 01:54:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
@@ -33,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.37 2007/05/18 15:46:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.38 2007/06/06 01:54:59 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/fstrans.h>
diff --git a/sys/fs/puffs/puffs_msgif.h b/sys/fs/puffs/puffs_msgif.h
index 6c5db0a81fa7..bf5d72b71f1b 100644
--- a/sys/fs/puffs/puffs_msgif.h
+++ b/sys/fs/puffs/puffs_msgif.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_msgif.h,v 1.32 2007/05/18 15:46:09 pooka Exp $	*/
+/*	$NetBSD: puffs_msgif.h,v 1.33 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
diff --git a/sys/fs/puffs/puffs_subr.c b/sys/fs/puffs/puffs_subr.c
index bf5ef6056ec5..292740a15dd9 100644
--- a/sys/fs/puffs/puffs_subr.c
+++ b/sys/fs/puffs/puffs_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_subr.c,v 1.31 2007/05/18 13:53:09 pooka Exp $	*/
+/*	$NetBSD: puffs_subr.c,v 1.32 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
@@ -33,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_subr.c,v 1.31 2007/05/18 13:53:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_subr.c,v 1.32 2007/06/06 01:55:00 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/fs/puffs/puffs_sys.h b/sys/fs/puffs/puffs_sys.h
index a8b97ae888ef..33cb1620a319 100644
--- a/sys/fs/puffs/puffs_sys.h
+++ b/sys/fs/puffs/puffs_sys.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_sys.h,v 1.38 2007/05/19 16:50:49 pooka Exp $	*/
+/*	$NetBSD: puffs_sys.h,v 1.39 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
diff --git a/sys/fs/puffs/puffs_transport.c b/sys/fs/puffs/puffs_transport.c
index 80ac54d18a0a..bb2034cc7010 100644
--- a/sys/fs/puffs/puffs_transport.c
+++ b/sys/fs/puffs/puffs_transport.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_transport.c,v 1.18 2007/05/17 13:59:22 pooka Exp $ */
+/* $NetBSD: puffs_transport.c,v 1.19 2007/06/06 01:55:00 pooka Exp $ */
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -14,9 +14,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. The name of the company nor the name of the author may 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
@@ -32,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_transport.c,v 1.18 2007/05/17 13:59:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_transport.c,v 1.19 2007/06/06 01:55:00 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/fs/puffs/puffs_vfsops.c b/sys/fs/puffs/puffs_vfsops.c
index 6e771e42362b..e65ef2aba2ad 100644
--- a/sys/fs/puffs/puffs_vfsops.c
+++ b/sys/fs/puffs/puffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vfsops.c,v 1.42 2007/05/17 13:59:22 pooka Exp $	*/
+/*	$NetBSD: puffs_vfsops.c,v 1.43 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
@@ -33,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.42 2007/05/17 13:59:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.43 2007/06/06 01:55:00 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sys/fs/puffs/puffs_vnops.c b/sys/fs/puffs/puffs_vnops.c
index 42c921203f1b..53cf224ff885 100644
--- a/sys/fs/puffs/puffs_vnops.c
+++ b/sys/fs/puffs/puffs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vnops.c,v 1.75 2007/06/06 01:33:10 pooka Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.76 2007/06/06 01:55:00 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may 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
@@ -33,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.75 2007/06/06 01:33:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.76 2007/06/06 01:55:00 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/fstrans.h>
diff --git a/usr.sbin/puffs/mount_psshfs/fs.c b/usr.sbin/puffs/mount_psshfs/fs.c
index bfa4c37f3cfb..c6091fdcf32c 100644
--- a/usr.sbin/puffs/mount_psshfs/fs.c
+++ b/usr.sbin/puffs/mount_psshfs/fs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fs.c,v 1.10 2007/05/18 16:13:47 pooka Exp $	*/
+/*	$NetBSD: fs.c,v 1.11 2007/06/06 01:55:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.10 2007/05/18 16:13:47 pooka Exp $");
+__RCSID("$NetBSD: fs.c,v 1.11 2007/06/06 01:55:03 pooka Exp $");
 #endif /* !lint */
 
 #include <err.h>
diff --git a/usr.sbin/puffs/mount_psshfs/node.c b/usr.sbin/puffs/mount_psshfs/node.c
index f108168afa36..2e42eb0c56a1 100644
--- a/usr.sbin/puffs/mount_psshfs/node.c
+++ b/usr.sbin/puffs/mount_psshfs/node.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: node.c,v 1.29 2007/05/18 18:00:07 pooka Exp $	*/
+/*	$NetBSD: node.c,v 1.30 2007/06/06 01:55:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: node.c,v 1.29 2007/05/18 18:00:07 pooka Exp $");
+__RCSID("$NetBSD: node.c,v 1.30 2007/06/06 01:55:03 pooka Exp $");
 #endif /* !lint */
 
 #include <assert.h>
diff --git a/usr.sbin/puffs/mount_psshfs/psbuf.c b/usr.sbin/puffs/mount_psshfs/psbuf.c
index 7772fd2704da..c8ca44a27efa 100644
--- a/usr.sbin/puffs/mount_psshfs/psbuf.c
+++ b/usr.sbin/puffs/mount_psshfs/psbuf.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: psbuf.c,v 1.9 2007/05/20 16:24:37 pooka Exp $        */
+/*      $NetBSD: psbuf.c,v 1.10 2007/06/06 01:55:03 pooka Exp $        */
 
 /*
  * Copyright (c) 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: psbuf.c,v 1.9 2007/05/20 16:24:37 pooka Exp $");
+__RCSID("$NetBSD: psbuf.c,v 1.10 2007/06/06 01:55:03 pooka Exp $");
 #endif /* !lint */
 
 /*
diff --git a/usr.sbin/puffs/mount_psshfs/psshfs.c b/usr.sbin/puffs/mount_psshfs/psshfs.c
index 637e37f211f6..6866f26741a8 100644
--- a/usr.sbin/puffs/mount_psshfs/psshfs.c
+++ b/usr.sbin/puffs/mount_psshfs/psshfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: psshfs.c,v 1.28 2007/05/21 08:55:04 pooka Exp $	*/
+/*	$NetBSD: psshfs.c,v 1.29 2007/06/06 01:55:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -44,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: psshfs.c,v 1.28 2007/05/21 08:55:04 pooka Exp $");
+__RCSID("$NetBSD: psshfs.c,v 1.29 2007/06/06 01:55:03 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/puffs/mount_psshfs/psshfs.h b/usr.sbin/puffs/mount_psshfs/psshfs.h
index a33fb59e9e84..5a981da531d0 100644
--- a/usr.sbin/puffs/mount_psshfs/psshfs.h
+++ b/usr.sbin/puffs/mount_psshfs/psshfs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: psshfs.h,v 1.19 2007/05/20 20:06:23 pooka Exp $	*/
+/*	$NetBSD: psshfs.h,v 1.20 2007/06/06 01:55:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/usr.sbin/puffs/mount_psshfs/sftp_proto.h b/usr.sbin/puffs/mount_psshfs/sftp_proto.h
index fff6662ca143..9ec54e0a0c45 100644
--- a/usr.sbin/puffs/mount_psshfs/sftp_proto.h
+++ b/usr.sbin/puffs/mount_psshfs/sftp_proto.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sftp_proto.h,v 1.1 2006/12/29 15:35:40 pooka Exp $	*/
+/*	$NetBSD: sftp_proto.h,v 1.2 2007/06/06 01:55:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
diff --git a/usr.sbin/puffs/mount_psshfs/subr.c b/usr.sbin/puffs/mount_psshfs/subr.c
index 505b74c90c74..2e634d7219f1 100644
--- a/usr.sbin/puffs/mount_psshfs/subr.c
+++ b/usr.sbin/puffs/mount_psshfs/subr.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: subr.c,v 1.23 2007/05/20 20:27:04 pooka Exp $        */
+/*      $NetBSD: subr.c,v 1.24 2007/06/06 01:55:03 pooka Exp $        */
         
 /*      
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may 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
@@ -30,7 +27,7 @@
         
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: subr.c,v 1.23 2007/05/20 20:27:04 pooka Exp $");
+__RCSID("$NetBSD: subr.c,v 1.24 2007/06/06 01:55:03 pooka Exp $");
 #endif /* !lint */
 
 #include <assert.h>