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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

2011-05-17 17:33:11 -04:00

..

Makefile

…

upt1_defs.h

…

vmxnet3_defs.h

…

vmxnet3_drv.c

vmxnet3: Use single tx queue when CONFIG_PCI_MSI not defined

2011-05-12 17:32:53 -04:00

vmxnet3_ethtool.c

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

2011-05-17 17:33:11 -04:00

vmxnet3_int.h

vmxnet3: Use single tx queue when CONFIG_PCI_MSI not defined

2011-05-12 17:32:53 -04:00