Module Name:    src
Committed By:   rmind
Date:           Mon Oct 19 23:19:40 UTC 2009

Modified Files:
        src/dist/tcpdump: cpack.c cpack.h ieee802_11_radio.h
        src/dist/wpa/hostapd: radiotap.h
        src/share/man/man3: bits.3
        src/share/man/man4: atw.4
        src/share/man/man4/man4.i386: cmos.4 elanpar.4 elanpex.4 geodewdog.4
        src/share/man/man9: in_getifa.9 rssadapt.9
        src/sys/arch/i386/isa: cmos.c
        src/sys/arch/i386/pci: geode.c geodereg.h geodewdg.c
        src/sys/arch/mips/adm5120: adm5120_extio_space.c
        src/sys/arch/mips/adm5120/dev: admgpio.c admpci.c admwdog.c wdc_extio.c
        src/sys/arch/mips/adm5120/include: adm5120_extiovar.h adm5120_pcivar.h
        src/sys/dev/cardbus: if_rtw_cardbus.c
        src/sys/dev/ic: al2210reg.h ath_netbsd.c ath_netbsd.h hfa3861areg.h
            max2820reg.h rf3000reg.h rtw.c rtwphy.c rtwphy.h rtwphyio.c
            rtwphyio.h rtwreg.h rtwvar.h sa2400reg.h si4136reg.h
        src/sys/net80211: ieee80211_radiotap.h ieee80211_rssadapt.c
            ieee80211_rssadapt.h ieee80211_sysctl.h
        src/sys/netinet: in_selsrc.c

Log Message:
Drop 3rd and 4th clauses from David Young's license.
Reviewed and approved by dyoung@ (copyright holder).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/tcpdump/cpack.c src/dist/tcpdump/cpack.h
cvs rdiff -u -r1.3 -r1.4 src/dist/tcpdump/ieee802_11_radio.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/dist/wpa/hostapd/radiotap.h
cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/bits.3
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/atw.4
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.i386/cmos.4
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.i386/elanpar.4 \
    src/share/man/man4/man4.i386/elanpex.4 \
    src/share/man/man4/man4.i386/geodewdog.4
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/in_getifa.9 \
    src/share/man/man9/rssadapt.9
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/isa/cmos.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/pci/geode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pci/geodereg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/pci/geodewdg.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_extio_space.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/dev/admgpio.c \
    src/sys/arch/mips/adm5120/dev/admpci.c \
    src/sys/arch/mips/adm5120/dev/admwdog.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/wdc_extio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/include/adm5120_extiovar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/include/adm5120_pcivar.h
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/if_rtw_cardbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/al2210reg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/ath_netbsd.c \
    src/sys/dev/ic/rtwphyio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/ath_netbsd.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/hfa3861areg.h \
    src/sys/dev/ic/rtwphyio.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/max2820reg.h \
    src/sys/dev/ic/sa2400reg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/rf3000reg.h src/sys/dev/ic/rtwphy.h \
    src/sys/dev/ic/si4136reg.h
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/rtwphy.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/rtwreg.h
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/rtwvar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/net80211/ieee80211_radiotap.h
cvs rdiff -u -r1.16 -r1.17 src/sys/net80211/ieee80211_rssadapt.c
cvs rdiff -u -r1.6 -r1.7 src/sys/net80211/ieee80211_rssadapt.h
cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_sysctl.h
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/in_selsrc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/dist/tcpdump/cpack.c
diff -u src/dist/tcpdump/cpack.c:1.2 src/dist/tcpdump/cpack.c:1.3
--- src/dist/tcpdump/cpack.c:1.2	Tue Jul 24 11:53:37 2007
+++ src/dist/tcpdump/cpack.c	Mon Oct 19 23:19:37 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpack.c,v 1.2 2007/07/24 11:53:37 drochner Exp $	*/
+/*	$NetBSD: cpack.c,v 1.3 2009/10/19 23:19:37 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/dist/tcpdump/cpack.h
diff -u src/dist/tcpdump/cpack.h:1.2 src/dist/tcpdump/cpack.h:1.3
--- src/dist/tcpdump/cpack.h:1.2	Tue Jul 24 11:53:37 2007
+++ src/dist/tcpdump/cpack.h	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpack.h,v 1.2 2007/07/24 11:53:37 drochner Exp $	*/
+/*	$NetBSD: cpack.h,v 1.3 2009/10/19 23:19:38 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/dist/tcpdump/ieee802_11_radio.h
diff -u src/dist/tcpdump/ieee802_11_radio.h:1.3 src/dist/tcpdump/ieee802_11_radio.h:1.4
--- src/dist/tcpdump/ieee802_11_radio.h:1.3	Tue Jul 24 11:53:39 2007
+++ src/dist/tcpdump/ieee802_11_radio.h	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee802_11_radio.h,v 1.3 2007/07/24 11:53:39 drochner Exp $	*/
+/*	$NetBSD: ieee802_11_radio.h,v 1.4 2009/10/19 23:19:38 rmind Exp $	*/
 
 /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp */
@@ -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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/dist/wpa/hostapd/radiotap.h
diff -u src/dist/wpa/hostapd/radiotap.h:1.1.1.1 src/dist/wpa/hostapd/radiotap.h:1.2
--- src/dist/wpa/hostapd/radiotap.h:1.1.1.1	Sat Aug 30 07:27:11 2008
+++ src/dist/wpa/hostapd/radiotap.h	Mon Oct 19 23:19:38 2009
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
-/* $NetBSD: radiotap.h,v 1.1.1.1 2008/08/30 07:27:11 christos Exp $ */
+/* $NetBSD: radiotap.h,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/share/man/man3/bits.3
diff -u src/share/man/man3/bits.3:1.3 src/share/man/man3/bits.3:1.4
--- src/share/man/man3/bits.3:1.3	Tue Aug 19 22:54:53 2008
+++ src/share/man/man3/bits.3	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bits.3,v 1.3 2008/08/19 22:54:53 jnemeth Exp $
+.\"	$NetBSD: bits.3,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2006 David Young.  All rights reserved.
 .\"
@@ -11,9 +11,6 @@
 .\"    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 David Young may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/share/man/man4/atw.4
diff -u src/share/man/man4/atw.4:1.10 src/share/man/man4/atw.4:1.11
--- src/share/man/man4/atw.4:1.10	Thu Jun 23 12:47:38 2005
+++ src/share/man/man4/atw.4	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-.\"     $NetBSD: atw.4,v 1.10 2005/06/23 12:47:38 peter Exp $
+.\"     $NetBSD: atw.4,v 1.11 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2003
 .\"	David Young <dyo...@netbsd.org>. 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. 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY David Young AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -27,7 +24,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: atw.4,v 1.10 2005/06/23 12:47:38 peter Exp $
+.\"	$Id: atw.4,v 1.11 2009/10/19 23:19:38 rmind Exp $
 .\"
 .Dd June 5, 2004
 .Dt ATW 4

Index: src/share/man/man4/man4.i386/cmos.4
diff -u src/share/man/man4/man4.i386/cmos.4:1.5 src/share/man/man4/man4.i386/cmos.4:1.6
--- src/share/man/man4/man4.i386/cmos.4:1.5	Mon Mar 23 16:04:25 2009
+++ src/share/man/man4/man4.i386/cmos.4	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: cmos.4,v 1.5 2009/03/23 16:04:25 joerg Exp $
+.\" $NetBSD: cmos.4,v 1.6 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2007 David Young.  All rights reserved.
 .\"
@@ -13,9 +13,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/share/man/man4/man4.i386/elanpar.4
diff -u src/share/man/man4/man4.i386/elanpar.4:1.3 src/share/man/man4/man4.i386/elanpar.4:1.4
--- src/share/man/man4/man4.i386/elanpar.4:1.3	Tue Apr  8 20:30:16 2008
+++ src/share/man/man4/man4.i386/elanpar.4	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: elanpar.4,v 1.3 2008/04/08 20:30:16 dyoung Exp $
+.\"	$NetBSD: elanpar.4,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\"
 .\" Copyright (c) 2008 David Young.  All rights reserved.
@@ -14,9 +14,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/share/man/man4/man4.i386/elanpex.4
diff -u src/share/man/man4/man4.i386/elanpex.4:1.3 src/share/man/man4/man4.i386/elanpex.4:1.4
--- src/share/man/man4/man4.i386/elanpex.4:1.3	Tue Apr  8 20:30:16 2008
+++ src/share/man/man4/man4.i386/elanpex.4	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: elanpex.4,v 1.3 2008/04/08 20:30:16 dyoung Exp $
+.\"	$NetBSD: elanpex.4,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\"
 .\" Copyright (c) 2008 David Young.  All rights reserved.
@@ -14,9 +14,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/share/man/man4/man4.i386/geodewdog.4
diff -u src/share/man/man4/man4.i386/geodewdog.4:1.3 src/share/man/man4/man4.i386/geodewdog.4:1.4
--- src/share/man/man4/man4.i386/geodewdog.4:1.3	Sat Jun 24 12:20:19 2006
+++ src/share/man/man4/man4.i386/geodewdog.4	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: geodewdog.4,v 1.3 2006/06/24 12:20:19 kardel Exp $
+.\"	$NetBSD: geodewdog.4,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2005 David Young.  All rights reserved.
 .\"
@@ -12,12 +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 David Young..
-.\" 4. The name of David Young may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/share/man/man9/in_getifa.9
diff -u src/share/man/man9/in_getifa.9:1.5 src/share/man/man9/in_getifa.9:1.6
--- src/share/man/man9/in_getifa.9:1.5	Mon Mar  9 19:24:32 2009
+++ src/share/man/man9/in_getifa.9	Mon Oct 19 23:19:37 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: in_getifa.9,v 1.5 2009/03/09 19:24:32 joerg Exp $
+.\" $NetBSD: in_getifa.9,v 1.6 2009/10/19 23:19:37 rmind Exp $
 .\"
 .\" Copyright (c) 2006 David Young.  All rights reserved.
 .\"
@@ -13,9 +13,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials provided
 .\"    with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/share/man/man9/rssadapt.9
diff -u src/share/man/man9/rssadapt.9:1.5 src/share/man/man9/rssadapt.9:1.6
--- src/share/man/man9/rssadapt.9:1.5	Sat Feb 25 01:04:26 2006
+++ src/share/man/man9/rssadapt.9	Mon Oct 19 23:19:37 2009
@@ -1,4 +1,4 @@
-.\"     $NetBSD: rssadapt.9,v 1.5 2006/02/25 01:04:26 wiz Exp $
+.\"     $NetBSD: rssadapt.9,v 1.6 2009/10/19 23:19:37 rmind Exp $
 .\"
 .\" Copyright (c) 2004 David Young.  All rights reserved.
 .\"
@@ -13,9 +13,6 @@
 .\"    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 David Young may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/arch/i386/isa/cmos.c
diff -u src/sys/arch/i386/isa/cmos.c:1.7 src/sys/arch/i386/isa/cmos.c:1.8
--- src/sys/arch/i386/isa/cmos.c:1.7	Wed Apr 15 20:44:26 2009
+++ src/sys/arch/i386/isa/cmos.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmos.c,v 1.7 2009/04/15 20:44:26 elad Exp $	*/
+/*	$NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $	*/
 
 /*
  * Copyright (C) 2003 JONE System Co., Inc.
@@ -43,9 +43,6 @@
  *    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 David Young 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
@@ -62,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.7 2009/04/15 20:44:26 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/arch/i386/pci/geode.c
diff -u src/sys/arch/i386/pci/geode.c:1.13 src/sys/arch/i386/pci/geode.c:1.14
--- src/sys/arch/i386/pci/geode.c:1.13	Sat May 10 13:38:34 2008
+++ src/sys/arch/i386/pci/geode.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: geode.c,v 1.13 2008/05/10 13:38:34 jmcneill Exp $	*/
+/*	$NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -14,12 +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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by David Young.
- * 4. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -70,7 +64,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.13 2008/05/10 13:38:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/arch/i386/pci/geodereg.h
diff -u src/sys/arch/i386/pci/geodereg.h:1.8 src/sys/arch/i386/pci/geodereg.h:1.9
--- src/sys/arch/i386/pci/geodereg.h:1.8	Thu Aug 31 19:24:37 2006
+++ src/sys/arch/i386/pci/geodereg.h	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: geodereg.h,v 1.8 2006/08/31 19:24:37 dyoung Exp $	*/
+/*	$NetBSD: geodereg.h,v 1.9 2009/10/19 23:19:38 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -13,12 +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 David Young.
- * 4. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/arch/i386/pci/geodewdg.c
diff -u src/sys/arch/i386/pci/geodewdg.c:1.9 src/sys/arch/i386/pci/geodewdg.c:1.10
--- src/sys/arch/i386/pci/geodewdg.c:1.9	Mon May  5 11:49:40 2008
+++ src/sys/arch/i386/pci/geodewdg.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: geodewdg.c,v 1.9 2008/05/05 11:49:40 xtraeme Exp $	*/
+/*	$NetBSD: geodewdg.c,v 1.10 2009/10/19 23:19:38 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -13,12 +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 David Young.
- * 4. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -69,7 +63,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.9 2008/05/05 11:49:40 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.10 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/arch/mips/adm5120/adm5120_extio_space.c
diff -u src/sys/arch/mips/adm5120/adm5120_extio_space.c:1.2 src/sys/arch/mips/adm5120/adm5120_extio_space.c:1.3
--- src/sys/arch/mips/adm5120/adm5120_extio_space.c:1.2	Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/adm5120/adm5120_extio_space.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -12,9 +12,6 @@
  *    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 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,
@@ -63,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 

Index: src/sys/arch/mips/adm5120/dev/admgpio.c
diff -u src/sys/arch/mips/adm5120/dev/admgpio.c:1.1 src/sys/arch/mips/adm5120/dev/admgpio.c:1.2
--- src/sys/arch/mips/adm5120/dev/admgpio.c:1.1	Tue Mar 20 08:52:01 2007
+++ src/sys/arch/mips/adm5120/dev/admgpio.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: admgpio.c,v 1.1 2007/03/20 08:52:01 dyoung Exp $ */
+/* $NetBSD: admgpio.c,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -12,9 +12,6 @@
  *    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 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,
@@ -31,7 +28,7 @@
  */
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.1 2007/03/20 08:52:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.2 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: src/sys/arch/mips/adm5120/dev/admpci.c
diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.1 src/sys/arch/mips/adm5120/dev/admpci.c:1.2
--- src/sys/arch/mips/adm5120/dev/admpci.c:1.1	Tue Mar 20 08:52:02 2007
+++ src/sys/arch/mips/adm5120/dev/admpci.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: admpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
+/* $NetBSD: admpci.c,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -12,9 +12,6 @@
  *    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 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,
@@ -64,7 +61,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.2 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
Index: src/sys/arch/mips/adm5120/dev/admwdog.c
diff -u src/sys/arch/mips/adm5120/dev/admwdog.c:1.1 src/sys/arch/mips/adm5120/dev/admwdog.c:1.2
--- src/sys/arch/mips/adm5120/dev/admwdog.c:1.1	Tue Mar 20 08:52:02 2007
+++ src/sys/arch/mips/adm5120/dev/admwdog.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: admwdog.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
+/* $NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -12,9 +12,6 @@
  *    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 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,
@@ -32,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/arch/mips/adm5120/dev/wdc_extio.c
diff -u src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.2 src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.3
--- src/sys/arch/mips/adm5120/dev/wdc_extio.c:1.2	Tue Mar 18 20:46:36 2008
+++ src/sys/arch/mips/adm5120/dev/wdc_extio.c	Mon Oct 19 23:19:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_extio.c,v 1.2 2008/03/18 20:46:36 cube Exp $ */
+/*	$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -15,9 +15,6 @@
  *    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 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,
@@ -64,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.2 2008/03/18 20:46:36 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>

Index: src/sys/arch/mips/adm5120/include/adm5120_extiovar.h
diff -u src/sys/arch/mips/adm5120/include/adm5120_extiovar.h:1.2 src/sys/arch/mips/adm5120/include/adm5120_extiovar.h:1.3
--- src/sys/arch/mips/adm5120/include/adm5120_extiovar.h:1.2	Tue Jan 15 22:22:37 2008
+++ src/sys/arch/mips/adm5120/include/adm5120_extiovar.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extiovar.h,v 1.2 2008/01/15 22:22:37 dyoung Exp $ */
+/* $NetBSD: adm5120_extiovar.h,v 1.3 2009/10/19 23:19:39 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -12,9 +12,6 @@
  *    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 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,

Index: src/sys/arch/mips/adm5120/include/adm5120_pcivar.h
diff -u src/sys/arch/mips/adm5120/include/adm5120_pcivar.h:1.1 src/sys/arch/mips/adm5120/include/adm5120_pcivar.h:1.2
--- src/sys/arch/mips/adm5120/include/adm5120_pcivar.h:1.1	Tue Mar 20 08:52:03 2007
+++ src/sys/arch/mips/adm5120/include/adm5120_pcivar.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_pcivar.h,v 1.1 2007/03/20 08:52:03 dyoung Exp $ */
+/* $NetBSD: adm5120_pcivar.h,v 1.2 2009/10/19 23:19:39 rmind Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -12,9 +12,6 @@
  *    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 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,

Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.31 src/sys/dev/cardbus/if_rtw_cardbus.c:1.32
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.31	Wed Sep 16 16:34:50 2009
+++ src/sys/dev/cardbus/if_rtw_cardbus.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.31 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.32 2009/10/19 23:19:39 rmind Exp $ */
 
 /*-
  * Copyright (c) 2004, 2005 David Young.  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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -67,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.31 2009/09/16 16:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.32 2009/10/19 23:19:39 rmind Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"

Index: src/sys/dev/ic/al2210reg.h
diff -u src/sys/dev/ic/al2210reg.h:1.4 src/sys/dev/ic/al2210reg.h:1.5
--- src/sys/dev/ic/al2210reg.h:1.4	Wed Mar  8 08:26:50 2006
+++ src/sys/dev/ic/al2210reg.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: al2210reg.h,v 1.4 2006/03/08 08:26:50 dyoung Exp $ */
+/* $NetBSD: al2210reg.h,v 1.5 2009/10/19 23:19:39 rmind Exp $ */
 
 /*
  * Copyright (c) 2004 David Young.  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. 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.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/dev/ic/ath_netbsd.c
diff -u src/sys/dev/ic/ath_netbsd.c:1.16 src/sys/dev/ic/ath_netbsd.c:1.17
--- src/sys/dev/ic/ath_netbsd.c:1.16	Wed Nov 12 12:36:11 2008
+++ src/sys/dev/ic/ath_netbsd.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ath_netbsd.c,v 1.16 2008/11/12 12:36:11 ad Exp $ */
+/*	$NetBSD: ath_netbsd.c,v 1.17 2009/10/19 23:19:39 rmind Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young
@@ -12,8 +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. 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
@@ -28,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.16 2008/11/12 12:36:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.17 2009/10/19 23:19:39 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
Index: src/sys/dev/ic/rtwphyio.c
diff -u src/sys/dev/ic/rtwphyio.c:1.16 src/sys/dev/ic/rtwphyio.c:1.17
--- src/sys/dev/ic/rtwphyio.c:1.16	Mon Mar  3 12:30:57 2008
+++ src/sys/dev/ic/rtwphyio.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.c,v 1.16 2008/03/03 12:30:57 tsutsui Exp $ */
+/* $NetBSD: rtwphyio.c,v 1.17 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -35,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.16 2008/03/03 12:30:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.17 2009/10/19 23:19:39 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/dev/ic/ath_netbsd.h
diff -u src/sys/dev/ic/ath_netbsd.h:1.8 src/sys/dev/ic/ath_netbsd.h:1.9
--- src/sys/dev/ic/ath_netbsd.h:1.8	Mon Nov 26 23:52:40 2007
+++ src/sys/dev/ic/ath_netbsd.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ath_netbsd.h,v 1.8 2007/11/26 23:52:40 dyoung Exp $ */
+/*	$NetBSD: ath_netbsd.h,v 1.9 2009/10/19 23:19:39 rmind Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young
@@ -12,8 +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. 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/dev/ic/hfa3861areg.h
diff -u src/sys/dev/ic/hfa3861areg.h:1.3 src/sys/dev/ic/hfa3861areg.h:1.4
--- src/sys/dev/ic/hfa3861areg.h:1.3	Fri Nov 16 04:52:36 2007
+++ src/sys/dev/ic/hfa3861areg.h	Mon Oct 19 23:19:39 2009
@@ -1,5 +1,5 @@
-/* $NetBSD: hfa3861areg.h,v 1.3 2007/11/16 04:52:36 dyoung Exp $ */
-/* $Id: hfa3861areg.h,v 1.3 2007/11/16 04:52:36 dyoung Exp $ */
+/* $NetBSD: hfa3861areg.h,v 1.4 2009/10/19 23:19:39 rmind Exp $ */
+/* $Id: hfa3861areg.h,v 1.4 2009/10/19 23:19:39 rmind Exp $ */
 /*
  * Copyright (c) 2007 David Young.  All rights reserved.
  *
@@ -14,9 +14,6 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution.
- * 3. David Young's name may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/sys/dev/ic/rtwphyio.h
diff -u src/sys/dev/ic/rtwphyio.h:1.3 src/sys/dev/ic/rtwphyio.h:1.4
--- src/sys/dev/ic/rtwphyio.h:1.3	Sun Dec 11 12:21:28 2005
+++ src/sys/dev/ic/rtwphyio.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: rtwphyio.h,v 1.4 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/dev/ic/max2820reg.h
diff -u src/sys/dev/ic/max2820reg.h:1.7 src/sys/dev/ic/max2820reg.h:1.8
--- src/sys/dev/ic/max2820reg.h:1.7	Thu Aug 31 19:24:37 2006
+++ src/sys/dev/ic/max2820reg.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: max2820reg.h,v 1.7 2006/08/31 19:24:37 dyoung Exp $ */
+/* $NetBSD: max2820reg.h,v 1.8 2009/10/19 23:19:39 rmind Exp $ */
 
 /*
  * Copyright (c) 2004 David Young.  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. 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.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/sys/dev/ic/sa2400reg.h
diff -u src/sys/dev/ic/sa2400reg.h:1.7 src/sys/dev/ic/sa2400reg.h:1.8
--- src/sys/dev/ic/sa2400reg.h:1.7	Thu Aug 31 19:24:38 2006
+++ src/sys/dev/ic/sa2400reg.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sa2400reg.h,v 1.7 2006/08/31 19:24:38 dyoung Exp $ */
+/* $NetBSD: sa2400reg.h,v 1.8 2009/10/19 23:19:39 rmind Exp $ */
 
 /*
  * Copyright (c) 2005 David Young.  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. 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.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/dev/ic/rf3000reg.h
diff -u src/sys/dev/ic/rf3000reg.h:1.5 src/sys/dev/ic/rf3000reg.h:1.6
--- src/sys/dev/ic/rf3000reg.h:1.5	Wed Mar  8 08:26:50 2006
+++ src/sys/dev/ic/rf3000reg.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rf3000reg.h,v 1.5 2006/03/08 08:26:50 dyoung Exp $ */
+/* $NetBSD: rf3000reg.h,v 1.6 2009/10/19 23:19:39 rmind Exp $ */
 
 /*
  * Copyright (c) 2005 David Young.  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. 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.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/sys/dev/ic/rtwphy.h
diff -u src/sys/dev/ic/rtwphy.h:1.5 src/sys/dev/ic/rtwphy.h:1.6
--- src/sys/dev/ic/rtwphy.h:1.5	Thu Dec 29 22:27:17 2005
+++ src/sys/dev/ic/rtwphy.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.h,v 1.5 2005/12/29 22:27:17 dyoung Exp $ */
+/* $NetBSD: rtwphy.h,v 1.6 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Index: src/sys/dev/ic/si4136reg.h
diff -u src/sys/dev/ic/si4136reg.h:1.5 src/sys/dev/ic/si4136reg.h:1.6
--- src/sys/dev/ic/si4136reg.h:1.5	Thu Aug 31 19:24:38 2006
+++ src/sys/dev/ic/si4136reg.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: si4136reg.h,v 1.5 2006/08/31 19:24:38 dyoung Exp $ */
+/* $NetBSD: si4136reg.h,v 1.6 2009/10/19 23:19:39 rmind Exp $ */
 
 /*
  * Copyright (c) 2005 David Young.  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. 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.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/dev/ic/rtw.c
diff -u src/sys/dev/ic/rtw.c:1.109 src/sys/dev/ic/rtw.c:1.110
--- src/sys/dev/ic/rtw.c:1.109	Wed Sep 16 16:34:50 2009
+++ src/sys/dev/ic/rtw.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.109 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: rtw.c,v 1.110 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 David Young.  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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -35,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.109 2009/09/16 16:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.110 2009/10/19 23:19:39 rmind Exp $");
 
 #include "bpfilter.h"
 

Index: src/sys/dev/ic/rtwphy.c
diff -u src/sys/dev/ic/rtwphy.c:1.14 src/sys/dev/ic/rtwphy.c:1.15
--- src/sys/dev/ic/rtwphy.c:1.14	Mon Mar  3 12:30:57 2008
+++ src/sys/dev/ic/rtwphy.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.c,v 1.14 2008/03/03 12:30:57 tsutsui Exp $ */
+/* $NetBSD: rtwphy.c,v 1.15 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -35,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.14 2008/03/03 12:30:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.15 2009/10/19 23:19:39 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

Index: src/sys/dev/ic/rtwreg.h
diff -u src/sys/dev/ic/rtwreg.h:1.26 src/sys/dev/ic/rtwreg.h:1.27
--- src/sys/dev/ic/rtwreg.h:1.26	Mon Sep  8 23:36:54 2008
+++ src/sys/dev/ic/rtwreg.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtwreg.h,v 1.26 2008/09/08 23:36:54 gmcgarry Exp $	*/
+/*	$NetBSD: rtwreg.h,v 1.27 2009/10/19 23:19:39 rmind Exp $	*/
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/dev/ic/rtwvar.h
diff -u src/sys/dev/ic/rtwvar.h:1.38 src/sys/dev/ic/rtwvar.h:1.39
--- src/sys/dev/ic/rtwvar.h:1.38	Wed Sep 16 16:34:50 2009
+++ src/sys/dev/ic/rtwvar.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwvar.h,v 1.38 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: rtwvar.h,v 1.39 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/net80211/ieee80211_radiotap.h
diff -u src/sys/net80211/ieee80211_radiotap.h:1.20 src/sys/net80211/ieee80211_radiotap.h:1.21
--- src/sys/net80211/ieee80211_radiotap.h:1.20	Mon Sep  8 23:36:55 2008
+++ src/sys/net80211/ieee80211_radiotap.h	Mon Oct 19 23:19:39 2009
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
-/* $NetBSD: ieee80211_radiotap.h,v 1.20 2008/09/08 23:36:55 gmcgarry Exp $ */
+/* $NetBSD: ieee80211_radiotap.h,v 1.21 2009/10/19 23:19:39 rmind Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/net80211/ieee80211_rssadapt.c
diff -u src/sys/net80211/ieee80211_rssadapt.c:1.16 src/sys/net80211/ieee80211_rssadapt.c:1.17
--- src/sys/net80211/ieee80211_rssadapt.c:1.16	Wed Nov 12 12:36:28 2008
+++ src/sys/net80211/ieee80211_rssadapt.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_rssadapt.c,v 1.16 2008/11/12 12:36:28 ad Exp $ */
+/* $NetBSD: ieee80211_rssadapt.c,v 1.17 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
  *
@@ -11,9 +11,6 @@
  *    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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -31,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_rssadapt.c,v 1.16 2008/11/12 12:36:28 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_rssadapt.c,v 1.17 2009/10/19 23:19:39 rmind Exp $");
 #endif
 
 #include <sys/param.h>

Index: src/sys/net80211/ieee80211_rssadapt.h
diff -u src/sys/net80211/ieee80211_rssadapt.h:1.6 src/sys/net80211/ieee80211_rssadapt.h:1.7
--- src/sys/net80211/ieee80211_rssadapt.h:1.6	Sat Dec 10 23:26:35 2005
+++ src/sys/net80211/ieee80211_rssadapt.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_rssadapt.h,v 1.6 2005/12/10 23:26:35 elad Exp $ */
+/* $NetBSD: ieee80211_rssadapt.h,v 1.7 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
  *
@@ -11,9 +11,6 @@
  *    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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/net80211/ieee80211_sysctl.h
diff -u src/sys/net80211/ieee80211_sysctl.h:1.8 src/sys/net80211/ieee80211_sysctl.h:1.9
--- src/sys/net80211/ieee80211_sysctl.h:1.8	Tue Dec 25 18:33:46 2007
+++ src/sys/net80211/ieee80211_sysctl.h	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_sysctl.h,v 1.8 2007/12/25 18:33:46 perry Exp $ */
+/* $NetBSD: ieee80211_sysctl.h,v 1.9 2009/10/19 23:19:39 rmind Exp $ */
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
  *
@@ -11,9 +11,6 @@
  *    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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

Index: src/sys/netinet/in_selsrc.c
diff -u src/sys/netinet/in_selsrc.c:1.7 src/sys/netinet/in_selsrc.c:1.8
--- src/sys/netinet/in_selsrc.c:1.7	Sun Aug 30 02:03:58 2009
+++ src/sys/netinet/in_selsrc.c	Mon Oct 19 23:19:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_selsrc.c,v 1.7 2009/08/30 02:03:58 dyoung Exp $	*/
+/*	$NetBSD: in_selsrc.c,v 1.8 2009/10/19 23:19:39 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -13,12 +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 David Young.
- * 4. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -35,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.7 2009/08/30 02:03:58 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.8 2009/10/19 23:19:39 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_conf.h"

Reply via email to