David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-02-27 18:31:39 -08:00
..
Kconfig	net: remove ks8695 driver	2019-09-04 17:57:43 +02:00
ks8842.c	netdev: pass the stuck queue to the timeout handler	2019-12-12 21:38:57 -08:00
ks8851.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
ks8851.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
ks8851_mll.c	net: ks8851-ml: Fix IRQ handling and locking	2020-02-23 20:53:42 -08:00
ksz884x.c	net: use netif_is_bridge_port() to check for IFF_BRIDGE_PORT	2020-02-20 10:10:32 -08:00
Makefile	net: remove ks8695 driver	2019-09-04 17:57:43 +02:00