David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-26 21:55:51 -05:00
..
cq_desc.h
cq_enet_desc.h	enic: Fix endianness bug.	2012-02-24 17:53:03 -05:00
enic_dev.c	net: make vlan ndo_vlan_rx_[add/kill]_vid return error value	2011-12-08 19:52:37 -05:00
enic_dev.h	net: make vlan ndo_vlan_rx_[add/kill]_vid return error value	2011-12-08 19:52:37 -05:00
enic_main.c	enic: Add support for fw init command on sriov vf's	2012-02-20 00:51:41 -05:00
enic_pp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05:00
enic_pp.h	enic: Add support for port profile association on a enic SRIOV VF	2011-09-27 01:10:24 -04:00
enic_res.c	enic: rename CMD_MAC_ADDR to CMD_GET_MAC_ADDR	2012-02-20 00:51:40 -05:00
enic_res.h
enic.h	enic: Add support for fw init command on sriov vf's	2012-02-20 00:51:41 -05:00
Kconfig
Makefile
rq_enet_desc.h
vnic_cq.c
vnic_cq.h
vnic_dev.c	enic: Add new fw devcmd to set mac address of an interface	2012-02-20 00:51:41 -05:00
vnic_dev.h	enic: Add new fw devcmd to set mac address of an interface	2012-02-20 00:51:41 -05:00
vnic_devcmd.h	enic: Add new fw devcmd to set mac address of an interface	2012-02-20 00:51:41 -05:00
vnic_enet.h
vnic_intr.c
vnic_intr.h
vnic_nic.h
vnic_resource.h
vnic_rq.c	drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages	2012-01-31 16:20:21 -05:00
vnic_rq.h
vnic_rss.h
vnic_stats.h
vnic_vic.c
vnic_vic.h
vnic_wq.c	drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages	2012-01-31 16:20:21 -05:00
vnic_wq.h
wq_enet_desc.h