You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
Makefile	…
upt1_defs.h	vmxnet3: remove set_flag_le{16,64} helpers	14 years ago
vmxnet3_defs.h	vmxnet3: remove set_flag_le{16,64} helpers	14 years ago
vmxnet3_drv.c	vmxnet3: Use single tx queue when CONFIG_PCI_MSI not defined	14 years ago
vmxnet3_ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
vmxnet3_int.h	vmxnet3: Use single tx queue when CONFIG_PCI_MSI not defined	14 years ago