David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
netxen	netxen_nic: remove redundant check if retries is zero	2017-03-15 15:04:08 -07:00
qed	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
qede	qede: allocate enough data for ->arfs_fltr_bmap	2017-04-20 16:23:23 -04:00
qlcnic	scripts/spelling.txt: add "partiton" pattern and fix typo instances	2017-02-27 18:43:46 -08:00
qlge	qlge: avoid format string exposure in workqueue	2017-04-06 13:37:21 -07:00
Kconfig	qed: Add support for hardware offloaded FCoE.	2017-02-19 18:10:42 -05:00
Makefile	qede: Add basic Network driver	2015-10-27 19:34:47 -07:00
qla3xxx.c	net: qlogic: qla3xxx: use new api ethtool_{get|set}_link_ksettings	2017-02-20 10:27:17 -05:00
qla3xxx.h