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		2010-12-17 12:27:22 -08:00
..
cq_desc.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
cq_enet_desc.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
enic_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
enic_res.c	enic: Add support for multiple hardware receive queues	2010-10-21 01:26:47 -07:00
enic_res.h	enic: Add ndo_set_rx_mode support for enic vnics	2010-12-10 15:39:42 -08:00
enic.h	enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type	2010-12-10 16:23:51 -08:00
Makefile	net: Add ndo_{set|get}_vf_port support for enic dynamic vnics	2010-05-17 22:50:19 -07:00
rq_enet_desc.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
vnic_cq.c	enic: Clean ups	2010-06-25 20:50:30 -07:00
vnic_cq.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
vnic_dev.c	enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT	2010-10-21 01:26:48 -07:00
vnic_dev.h	enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT	2010-10-21 01:26:48 -07:00
vnic_devcmd.h	enic: Add new firmware devcmds	2010-08-17 02:32:57 -07:00
vnic_enet.h	enic: Mark intr_timer in vnic_enet_config as deprecated	2010-08-17 02:32:59 -07:00
vnic_intr.c	enic: Remove dead code	2010-10-01 00:36:52 -07:00
vnic_intr.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
vnic_nic.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
vnic_resource.h	enic: Add support for firmware management device	2010-08-17 02:32:56 -07:00
vnic_rq.c	enic: Make local functions static	2010-10-01 00:36:52 -07:00
vnic_rq.h	enic: Make local functions static	2010-10-01 00:36:52 -07:00
vnic_rss.h	enic: Add support for multiple hardware receive queues	2010-10-21 01:26:47 -07:00
vnic_stats.h	enic: Clean ups	2010-06-25 20:50:30 -07:00
vnic_vic.c	enic: Use offsetof macro in vic tlv length calculation	2010-08-17 02:32:58 -07:00
vnic_vic.h	enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type	2010-12-10 16:23:51 -08:00
vnic_wq.c	enic: Make local functions static	2010-10-01 00:36:52 -07:00
vnic_wq.h	enic: Make local functions static	2010-10-01 00:36:52 -07:00
wq_enet_desc.h	enic: Clean ups	2010-06-25 20:50:30 -07:00