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
..
core	Merge branches 'cxgb4', 'flowsteer' and 'misc' into for-linus	2013-12-23 09:19:02 -08:00
hw	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
ulp	infiniband: make sure the src net is infiniband when create new link	2014-01-03 20:38:56 -05:00
Kconfig	IB/core: Re-enable create_flow/destroy_flow uverbs	2013-11-17 08:22:09 -08:00
Makefile	mlx5: Add driver for Mellanox Connect-IB adapters	2013-07-08 10:32:24 -07:00