aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2008-01-17 09:46:16 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2008-01-17 09:46:16 +0000
commiteaf56834f1701d5421453ed31f6e785130054075 (patch)
treefc4e8e88a59898d0c22f7e4730eeccb1858ea3d2 /sys
parent4f6a96ae5be753744c3d9a0e1f0dc72e047bc300 (diff)
downloadsrc-eaf56834f1701d5421453ed31f6e785130054075.tar.gz
src-eaf56834f1701d5421453ed31f6e785130054075.zip
Sync from OpenBSD r1.118, nuke clause 3 & 4.
Notes
Notes: svn path=/head/; revision=175396
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_bridge.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index d9c76e3a9ace..7d068ffe9785 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -47,11 +47,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 Jason L. Wright
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED