Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 18 May 2010 17:09:22 +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.o4IH9sGL068958@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
marius      2010-05-18 17:09:22 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/dev/e1000        if_em.c 
  Log:
  SVN rev 208269 on 2010-05-18 17:09:22Z by marius
  
  MFC: r208117
  
  Fix a mismerge in r206001 (MFC'ed to stable/7 in r208105).
  
  PR:             146614
  Approved by:    jfv (implicit)
  
  Revision  Changes    Path
  1.1.2.5   +3 -3      src/sys/dev/e1000/if_em.c

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005181709.o4IH9sGL068958>