David S. Miller cfadf853f6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/sh_eth.c

2009-10-27 01:03:26 -07:00

..

82571.c

e1000e: swap max hw supported frame size between 82574 and 82583

2009-10-04 21:08:49 -07: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/davem/net-2.6

2009-10-27 01:03:26 -07:00

es2lan.c

e1000e: add support for 82577/82578 GbE LOM parts

2009-06-03 02:46:34 -07:00

ethtool.c

e1000e: Fix erroneous display of stats by ethtool -S

2009-10-13 11:48:27 -07:00

hw.h

e1000e: allow for swflag to be held over consecutive PHY accesses

2009-10-26 16:16:25 -07:00

ich8lan.c

e1000e: allow for swflag to be held over consecutive PHY accesses

2009-10-26 16:16:25 -07:00

lib.c

e1000e: disable K1 at 1000Mbps for 82577/82578

2009-07-03 20:09:42 -07:00

Makefile

e1000e: reformat comment blocks, cosmetic changes only

2008-03-28 22:14:56 -04:00

netdev.c

net: Use netdev_alloc_skb_ip_align()

2009-10-13 11:48:18 -07:00

param.c

e1000e: enable CRC stripping by default

2009-06-03 02:46:31 -07:00

phy.c

e1000e: allow for swflag to be held over consecutive PHY accesses

2009-10-26 16:16:25 -07:00