David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
netxen	netxen: Use kobj_to_dev()	2016-02-25 16:51:05 -05:00
qed	qed: Enable GRE tunnel slowpath configuration	2016-04-15 17:08:09 -04:00
qede	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
qlcnic	qlcnic: protect qlicnic_attach_func with rtnl_lock	2016-04-21 15:35:44 -04:00
qlge	qlge: Replace create_singlethread_workqueue with alloc_ordered_workqueue	2016-04-15 16:42:10 -04:00
Kconfig	qed/qede: Add GENEVE tunnel slowpath configuration support	2016-04-15 17:08:08 -04:00
Makefile	qede: Add basic Network driver	2015-10-27 19:34:47 -07:00
qla3xxx.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
qla3xxx.h