From owner-cvs-src-old@FreeBSD.ORG  Tue May 18 17:09:48 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 099531065704
	for <cvs-src-old@freebsd.org>; Tue, 18 May 2010 17:09:48 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D2E4B8FC22
	for <cvs-src-old@freebsd.org>; Tue, 18 May 2010 17:09:47 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IH9l5M068938
	for <cvs-src-old@freebsd.org>; Tue, 18 May 2010 17:09:47 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4IH9luU068937
	for cvs-src-old@freebsd.org; Tue, 18 May 2010 17:09:47 GMT
	(envelope-from marius@repoman.freebsd.org)
Message-Id: <201005181709.o4IH9luU068937@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	marius@repoman.freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 18 May 2010 17:09:20 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/dev/e1000 if_em.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 May 2010 17:09:48 -0000

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