Mark two more items as merged.

This commit is contained in:
Christian Brueffer 2006-07-31 16:49:25 +00:00
parent 80cd95f9cc
commit a688fd8409
2 changed files with 4 additions and 4 deletions

View File

@ -618,7 +618,7 @@
<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
<para>The &man.my.4; driver now supports &man.altq.4;.</para>
<para>The &man.my.4; driver now supports &man.altq.4;. &merged;</para>
<para arch="i386,amd64">The &man.mxge.4; driver,
which supports Myricom Myri10GE 10 Gigabit Ethernet
@ -641,7 +641,7 @@
<para>The &man.sk.4; driver is now MPSAFE. &merged;</para>
<para>The &man.ste.4; driver is now MPSAFE.</para>
<para>The &man.ste.4; driver is now MPSAFE. &merged;</para>
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was

View File

@ -618,7 +618,7 @@
<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
<para>The &man.my.4; driver now supports &man.altq.4;.</para>
<para>The &man.my.4; driver now supports &man.altq.4;. &merged;</para>
<para arch="i386,amd64">The &man.mxge.4; driver,
which supports Myricom Myri10GE 10 Gigabit Ethernet
@ -641,7 +641,7 @@
<para>The &man.sk.4; driver is now MPSAFE. &merged;</para>
<para>The &man.ste.4; driver is now MPSAFE.</para>
<para>The &man.ste.4; driver is now MPSAFE. &merged;</para>
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was