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

Conflicts:
	drivers/net/bnx2x/bnx2x.h

2011-03-03 21:27:42 -08:00

..

defines.h

…

ethtool.c

net: use pci_dev->revision, again

2011-02-28 11:57:33 -08:00

igbvf.h

igbvf: remove Tx hang detection

2011-02-24 02:38:38 -08:00

Makefile

…

mbx.c

…

mbx.h

…

netdev.c

net: use pci_dev->revision, again

2011-02-28 11:57:33 -08:00

regs.h

…

vf.c

igb: fix sparse warning

2011-03-02 03:33:48 -08:00

vf.h

igbvf: add support for i350 VF device

2010-12-24 21:38:47 -08:00