David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-27 14:23:31 -07:00
..
nfp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-27 14:23:31 -07:00
Kconfig	nfp: add tls init code	2019-06-06 14:13:40 -07:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00