Date: Tue, 18 May 2010 17:09:20 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/dev/e1000 if_em.c Message-ID: <201005181709.o4IH9luU068937@repoman.freebsd.org>
index | next in thread | raw e-mail
marius 2010-05-18 17:09:20 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
sys/dev/e1000 if_em.c
Log:
SVN rev 208268 on 2010-05-18 17:09:20Z by marius
MFC: r208117
Fix a mismerge in r206001 (MFC'ed to stable/8 in r206211).
PR: 146614
Approved by: jfv (implicit)
Revision Changes Path
1.21.2.10 +3 -3 src/sys/dev/e1000/if_em.c
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005181709.o4IH9luU068937>
