David S. Miller 6cdee2f96a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/yellowfin.c		2009-09-02 00:32:56 -07:00
..
82571.c	e1000e: Fixes possible phy corrupton on 82571 designs.	2009-06-09 05:25:35 -07:00
Makefile	e1000e: reformat comment blocks, cosmetic changes only	2008-03-28 22:14:56 -04:00
defines.h	e1000e: delay after LCD reset and proper checks for PHY configuration done	2009-07-03 20:09:29 -07:00
e1000.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
es2lan.c	e1000e: add support for 82577/82578 GbE LOM parts	2009-06-03 02:46:34 -07:00
ethtool.c	e1000e: Expose MDI-X status via ethtool change	2009-06-09 05:25:36 -07:00
hw.h	e1000e: disable K1 at 1000Mbps for 82577/82578	2009-07-03 20:09:42 -07:00
ich8lan.c	e1000e: fix potential NVM corruption on ICH9 with 8K bank size	2009-08-09 21:45:38 -07:00
lib.c	e1000e: disable K1 at 1000Mbps for 82577/82578	2009-07-03 20:09:42 -07:00
netdev.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-09-02 00:32:56 -07:00
param.c	e1000e: enable CRC stripping by default	2009-06-03 02:46:31 -07:00
phy.c	e1000e: delay second read of PHY_STATUS register on failure of first read	2009-07-03 20:09:39 -07:00