David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
82571.c	e1000e: Fixes possible phy corrupton on 82571 designs.	2009-06-09 05:25:35 -07:00
defines.h	e1000e: Fixes possible phy corrupton on 82571 designs.	2009-06-09 05:25:35 -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: Fixes possible phy corrupton on 82571 designs.	2009-06-09 05:25:35 -07:00
ich8lan.c	e1000e: workaround a Tx hang on 82577/82578	2009-06-03 02:46:36 -07:00
lib.c	e1000e: add support for 82577/82578 GbE LOM parts	2009-06-03 02:46:34 -07:00
Makefile	e1000e: reformat comment blocks, cosmetic changes only	2008-03-28 22:14:56 -04:00
netdev.c	e1000e: Call e1000e_config_collision_dist() after TCTL has been set	2009-06-09 05:25:36 -07:00
param.c	e1000e: enable CRC stripping by default	2009-06-03 02:46:31 -07:00
phy.c	e1000e: add support for 82577/82578 GbE LOM parts	2009-06-03 02:46:34 -07:00