From owner-cvs-src-old@FreeBSD.ORG  Sat May 15 19:46:33 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 7A19D106564A
	for <cvs-src-old@freebsd.org>; Sat, 15 May 2010 19:46:33 +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 4F1698FC0A
	for <cvs-src-old@freebsd.org>; Sat, 15 May 2010 19:46:33 +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 o4FJkXAR047803
	for <cvs-src-old@freebsd.org>; Sat, 15 May 2010 19:46:33 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4FJkXQv047802
	for cvs-src-old@freebsd.org; Sat, 15 May 2010 19:46:33 GMT
	(envelope-from marius@repoman.freebsd.org)
Message-Id: <201005151946.o4FJkXQv047802@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: Sat, 15 May 2010 19:46:16 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
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: Sat, 15 May 2010 19:46:33 -0000

marius      2010-05-15 19:46:16 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/e1000        if_em.c 
  Log:
  SVN rev 208117 on 2010-05-15 19:46:16Z by marius
  
  Fix a mismerge in r206001.
  
  PR:             146614
  Approved by:    jfv (implicit)
  MFC afer:       3 days
  
  Revision  Changes    Path
  1.47      +3 -3      src/sys/dev/e1000/if_em.c