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 b4aa9e05a6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c		14 years ago
..
Makefile	net: Add ndo_{set|get}_vf_port support for enic dynamic vnics	15 years ago
cq_desc.h	enic: Clean ups	15 years ago
cq_enet_desc.h	enic: Clean ups	15 years ago
enic.h	enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type	14 years ago
enic_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
enic_res.c	enic: Add support for multiple hardware receive queues	14 years ago
enic_res.h	enic: Add ndo_set_rx_mode support for enic vnics	14 years ago
rq_enet_desc.h	enic: Clean ups	15 years ago
vnic_cq.c	enic: Clean ups	15 years ago
vnic_cq.h	enic: Clean ups	15 years ago
vnic_dev.c	enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT	14 years ago
vnic_dev.h	enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT	14 years ago
vnic_devcmd.h	enic: Add new firmware devcmds	15 years ago
vnic_enet.h	enic: Mark intr_timer in vnic_enet_config as deprecated	15 years ago
vnic_intr.c	enic: Remove dead code	15 years ago
vnic_intr.h	enic: Clean ups	15 years ago
vnic_nic.h	enic: Clean ups	15 years ago
vnic_resource.h	enic: Add support for firmware management device	15 years ago
vnic_rq.c	enic: Make local functions static	15 years ago
vnic_rq.h	enic: Make local functions static	15 years ago
vnic_rss.h	enic: Add support for multiple hardware receive queues	14 years ago
vnic_stats.h	enic: Clean ups	15 years ago
vnic_vic.c	enic: Use offsetof macro in vic tlv length calculation	15 years ago
vnic_vic.h	enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type	14 years ago
vnic_wq.c	enic: Make local functions static	15 years ago
vnic_wq.h	enic: Make local functions static	15 years ago
wq_enet_desc.h	enic: Clean ups	15 years ago