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

Conflicts:

	drivers/net/hp-plus.c
	drivers/net/wireless/ath5k/base.c
	drivers/net/wireless/ath9k/recv.c
	net/wireless/reg.c

2008-11-26 23:48:40 -08:00

..

82571.c

e1000e: check return code from NVM accesses and fix bank detection

2008-11-21 17:02:41 -08:00

defines.h

e1000e: check return code from NVM accesses and fix bank detection

2008-11-21 17:02:41 -08:00

e1000.h

e1000e: fix incorrect link status when switch module pulled

2008-11-21 17:01:35 -08:00

es2lan.c

e1000e: ESB2 config after link up

2008-11-21 16:53:51 -08:00

ethtool.c

e1000e: check return code from NVM accesses and fix bank detection

2008-11-21 17:02:41 -08:00

hw.h

e1000e: sync change flow control variables with ixgbe

2008-11-21 16:57:36 -08:00

ich8lan.c

e1000e: check return code from NVM accesses and fix bank detection

2008-11-21 17:02:41 -08:00

lib.c

e1000e: sync change flow control variables with ixgbe

2008-11-21 16:57:36 -08:00

Makefile

e1000e: reformat comment blocks, cosmetic changes only

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

netdev.c

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

2008-11-26 23:48:40 -08:00

param.c

e1000e: fix IPMI traffic

2008-11-16 19:05:16 -08:00

phy.c

e1000e: sync change flow control variables with ixgbe

2008-11-21 16:57:36 -08:00