David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-06 22:10:13 -07:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile
ps3_gelic_net.c	docs: networking: convert netconsole.txt to ReST	2020-04-30 12:56:36 -07:00
ps3_gelic_net.h	toshiba: Replace zero-length array with flexible-array member	2020-02-24 15:26:17 -08:00
ps3_gelic_wireless.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 176	2019-05-30 11:29:19 -07:00
ps3_gelic_wireless.h	toshiba: Replace zero-length array with flexible-array member	2020-02-24 15:26:17 -08:00
spider_net.c	docs: networking: convert netconsole.txt to ReST	2020-04-30 12:56:36 -07:00
spider_net.h	toshiba: Replace zero-length array with flexible-array member	2020-02-24 15:26:17 -08:00
spider_net_ethtool.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 153	2019-05-30 11:26:32 -07:00
tc35815.c	net: tc35815: Fix phydev supported/advertising mask	2020-04-27 11:52:10 -07:00