head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.28.1.4.2
	RELENG_9_1:1.2.28.1.0.4
	RELENG_9_1_BP:1.2.28.1
	RELENG_8_3_0_RELEASE:1.2.22.1.8.1
	RELENG_8_3:1.2.22.1.0.8
	RELENG_8_3_BP:1.2.22.1
	RELENG_9_0_0_RELEASE:1.2.28.1.2.1
	RELENG_9_0:1.2.28.1.0.2
	RELENG_9_0_BP:1.2.28.1
	RELENG_9:1.2.0.28
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.2.26.1
	RELENG_8_2_0_RELEASE:1.2.22.1.6.1
	RELENG_7_4:1.2.0.26
	RELENG_7_4_BP:1.2
	RELENG_8_2:1.2.22.1.0.6
	RELENG_8_2_BP:1.2.22.1
	RELENG_8_1_0_RELEASE:1.2.22.1.4.1
	RELENG_8_1:1.2.22.1.0.4
	RELENG_8_1_BP:1.2.22.1
	RELENG_7_3_0_RELEASE:1.2.24.1
	RELENG_7_3:1.2.0.24
	RELENG_7_3_BP:1.2
	RELENG_8_0_0_RELEASE:1.2.22.1.2.1
	RELENG_8_0:1.2.22.1.0.2
	RELENG_8_0_BP:1.2.22.1
	RELENG_8:1.2.0.22
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.20.1
	RELENG_7_2:1.2.0.20
	RELENG_7_2_BP:1.2
	RELENG_7_1_0_RELEASE:1.2.18.1
	RELENG_6_4_0_RELEASE:1.2.16.1
	RELENG_7_1:1.2.0.18
	RELENG_7_1_BP:1.2
	RELENG_6_4:1.2.0.16
	RELENG_6_4_BP:1.2
	RELENG_7_0_0_RELEASE:1.2
	RELENG_6_3_0_RELEASE:1.2
	RELENG_7_0:1.2.0.14
	RELENG_7_0_BP:1.2
	RELENG_6_3:1.2.0.12
	RELENG_6_3_BP:1.2
	RELENG_7:1.2.0.10
	RELENG_7_BP:1.2
	RELENG_6_2_0_RELEASE:1.2
	RELENG_6_2:1.2.0.8
	RELENG_6_2_BP:1.2
	RELENG_5_5_0_RELEASE:1.1.4.1
	RELENG_5_5:1.1.4.1.0.4
	RELENG_5_5_BP:1.1.4.1
	RELENG_6_1_0_RELEASE:1.2
	RELENG_6_1:1.2.0.6
	RELENG_6_1_BP:1.2
	RELENG_6_0_0_RELEASE:1.2
	RELENG_6_0:1.2.0.4
	RELENG_6_0_BP:1.2
	RELENG_6:1.2.0.2
	RELENG_6_BP:1.2
	RELENG_5_4_0_RELEASE:1.1.4.1
	RELENG_5_4:1.1.4.1.0.2
	RELENG_5_4_BP:1.1.4.1
	RELENG_4_11_0_RELEASE:1.1.2.1
	RELENG_4_11:1.1.2.1.0.2
	RELENG_4_11_BP:1.1.2.1
	RELENG_5_3_0_RELEASE:1.1
	RELENG_5_3:1.1.0.6
	RELENG_5_3_BP:1.1
	RELENG_5:1.1.0.4
	RELENG_5_BP:1.1
	RELENG_4:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.52.01;	author svnexp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2005.01.06.01.42.53;	author imp;	state Exp;
branches
	1.2.2.1
	1.2.10.1
	1.2.16.1
	1.2.18.1
	1.2.20.1
	1.2.22.1
	1.2.24.1
	1.2.26.1
	1.2.28.1;
next	1.1;

1.1
date	2004.05.28.00.22.58;	author tackerman;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.3.2.1
date	2012.11.17.01.52.01;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.04.45;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2012.11.17.07.43.19;	author svnexp;	state Exp;
branches;
next	;

1.2.10.1
date	2012.11.17.08.05.46;	author svnexp;	state Exp;
branches;
next	;

1.2.16.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.18.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.20.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.22.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.22.1.2.1
	1.2.22.1.4.1
	1.2.22.1.6.1
	1.2.22.1.8.1;
next	1.2.22.2;

1.2.22.2
date	2012.11.17.10.36.40;	author svnexp;	state Exp;
branches;
next	;

1.2.22.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.22.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.22.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.22.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.22.1.8.2;

1.2.22.1.8.2
date	2012.11.17.08.25.19;	author svnexp;	state Exp;
branches;
next	;

1.2.24.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.26.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.26.2;

1.2.26.2
date	2012.11.17.08.17.15;	author svnexp;	state Exp;
branches;
next	;

1.2.28.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.28.1.2.1
	1.2.28.1.4.1;
next	1.2.28.2;

1.2.28.2
date	2012.11.17.11.37.01;	author svnexp;	state Exp;
branches;
next	;

1.2.28.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.28.1.2.2;

1.2.28.1.2.2
date	2012.11.17.08.36.57;	author svnexp;	state Exp;
branches;
next	;

1.2.28.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.28.1.4.2;

1.2.28.1.4.2
date	2012.11.17.08.47.49;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2004.06.17.18.07.39;	author tackerman;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.25.46;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1
date	2005.01.30.00.59.52;	author imp;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@/*$FreeBSD: head/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
/*-

Copyright (c) 2001-2004, Intel Corporation
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.

 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 Intel Corporation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

*/
@


1.3.2.1
log
@file LICENSE was added on branch RELENG_8_4 on 2013-03-28 13:04:45 +0000
@
text
@d1 33
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 33
/*$FreeBSD: releng/8.4/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
/*-

Copyright (c) 2001-2004, Intel Corporation
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.

 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 Intel Corporation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

*/
@


1.2
log
@Start each of the license/copyright comments with /*-, minor shuffle of lines
@
text
@d1 1
a1 1
/*$FreeBSD$*/
@


1.2.10.1
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: stable/7/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.2.1
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: stable/6/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.28.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.28.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
/*$FreeBSD: stable/9/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.28.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.28.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: releng/9.1/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.28.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.28.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: releng/9.0/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.26.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.26.2
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: releng/7.4/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.24.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.22.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.22.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
/*$FreeBSD: stable/8/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.22.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.22.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: releng/8.3/sys/dev/ixgb/LICENSE 139749 2005-01-06 01:43:34Z imp $*/
@


1.2.22.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.22.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.22.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2.20.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.18.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.16.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.1
log
@First release of ixgb driver for the Intel(R) PRO/10GbE Family of Adapters.  This driver has
been developed for use with FreeBSD, version 4.8 and later.

Submitted by:	Hema Joyce
Reviewed by: 	Prafulla Deuskar
Approved by: 	Prafulla Deuskar
MFC after:	1 week
@
text
@d2 2
d32 2
@


1.1.4.1
log
@MFC: /*- and my license changes for sys/[a-d]*
@
text
@a1 2
/*-

a29 2

*/
@


1.1.2.1
log
@MFC
First release of ixgb driver for the Intel(R) PRO/10GbE Family of Adapters.  This driver has
been developed for use with FreeBSD, version 4.8 and later.

Submitted by:	Hema Joyce
Reviewed by:  	Prafulla Deuskar
Approved by:  	Prafulla Deuskar
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
/*$FreeBSD: stable/4/sys/dev/ixgb/LICENSE 130647 2004-06-17 18:07:41Z tackerman $*/
@


