Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -08:00
..
ehea	net: ehea: convert tasklets to use new tasklet_setup() API	2020-09-14 13:02:37 -07:00
emac	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
ibmveth.c	ibmveth: Fix use of ibmveth in a bridge.	2020-10-27 17:52:51 -07:00
ibmveth.h	net/ethtool: Introduce link_ksettings API for virtual network devices	2020-02-29 21:48:55 -08:00
ibmvnic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
ibmvnic.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile