David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-27 15:43:10 -04:00
..
netxen	netxen: Use kobj_to_dev()	2016-02-25 16:51:05 -05:00
qed	qed: Add PF min bandwidth configuration support	2016-04-26 13:56:26 -04:00
qede	qed*: Conditions for changing link	2016-04-25 15:59:16 -04:00
qlcnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-27 15:43:10 -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