Date: Fri, 29 Dec 2017 00:59:57 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327331 - head/sys/dev/txp Message-ID: <201712290059.vBT0xv0U013379@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Fri Dec 29 00:59:56 2017 New Revision: 327331 URL: https://svnweb.freebsd.org/changeset/base/327331 Log: if_txpreg.h: drop clauses 3 and 4. Obtained from: OpenBSD (CVS 1.35) Modified: head/sys/dev/txp/if_txpreg.h Modified: head/sys/dev/txp/if_txpreg.h ============================================================================== --- head/sys/dev/txp/if_txpreg.h Fri Dec 29 00:56:15 2017 (r327330) +++ head/sys/dev/txp/if_txpreg.h Fri Dec 29 00:59:56 2017 (r327331) @@ -1,8 +1,8 @@ -/* $OpenBSD: if_txpreg.h,v 1.34 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: if_txpreg.h,v 1.35 2003/06/04 19:36:33 deraadt Exp $ */ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>. * All rights reserved. @@ -15,11 +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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Aaron Campbell. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712290059.vBT0xv0U013379>