summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorbrueffer <brueffer@FreeBSD.org>2006-08-11 12:32:43 +0000
committerbrueffer <brueffer@FreeBSD.org>2006-08-11 12:32:43 +0000
commit9dd9212e7f6c543c091189155dd7e63d95dbbc5d (patch)
treebe50833b4f023b4c9c931912804ed77d94125fab /release
parent8946cbf76bdb4c2901e6de4e97056baa6f190ddb (diff)
downloadFreeBSD-src-9dd9212e7f6c543c091189155dd7e63d95dbbc5d.zip
FreeBSD-src-9dd9212e7f6c543c091189155dd7e63d95dbbc5d.tar.gz
- em(4) updated to version 6.1.4
- stge(4) merged
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml7
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml7
2 files changed, 8 insertions, 6 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 65285b4..9199871 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -579,8 +579,9 @@
architectures such as sparc64. &merged;</para>
<para>The &man.em.4; driver has been updated to
- version 5.1.5 from Intel. Among other changes, it now supports
- 82571 and 82572 based adapters.</para>
+ version 6.1.4 from Intel. Among other changes, it now supports
+ 80003, 82571, 82571EB and 82572 based adapters, as well as
+ onboard-NICs on ICH8-based motherboards.</para>
<para>The &man.em.4; driver now includes
initial support for suspend and resume features.</para>
@@ -645,7 +646,7 @@
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was
- ported from NetBSD.</para>
+ ported from NetBSD. &merged;</para>
<para>The &man.ti.4; driver now supports big-endian
architectures such as sparc64.</para>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 65285b4..9199871 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -579,8 +579,9 @@
architectures such as sparc64. &merged;</para>
<para>The &man.em.4; driver has been updated to
- version 5.1.5 from Intel. Among other changes, it now supports
- 82571 and 82572 based adapters.</para>
+ version 6.1.4 from Intel. Among other changes, it now supports
+ 80003, 82571, 82571EB and 82572 based adapters, as well as
+ onboard-NICs on ICH8-based motherboards.</para>
<para>The &man.em.4; driver now includes
initial support for suspend and resume features.</para>
@@ -645,7 +646,7 @@
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was
- ported from NetBSD.</para>
+ ported from NetBSD. &merged;</para>
<para>The &man.ti.4; driver now supports big-endian
architectures such as sparc64.</para>
OpenPOWER on IntegriCloud