David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
cxgb	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
cxgb3	net: cxgb3: slight optimization of addr compare	2013-12-31 16:48:30 -05:00
cxgb4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
cxgb4vf	cxgb4: make functions static and remove dead code	2013-12-22 18:32:44 -05:00
Kconfig	cxgb3: Restore dependency on INET	2012-11-28 17:40:59 -05:00
Makefile