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

..

defines.h

…

ethtool.c

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

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

igbvf.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

Makefile

…

mbx.c

…

mbx.h

…

netdev.c

net: Use netdev_alloc_skb_ip_align()

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

regs.h

…

vf.c

igbvf: Allow VF driver to correctly recognize failure to set mac

2009-08-04 11:46:41 -07:00

vf.h

…