David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
nic_main.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
nic_reg.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
nic.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
nicvf_ethtool.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
nicvf_main.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
nicvf_queues.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
nicvf_queues.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
q_struct.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
thunder_bgx.c	net: thunderx: Use fwnode_get_mac_address()	2019-07-23 14:09:21 -07:00
thunder_bgx.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
thunder_xcv.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00