Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-06-18 19:47:02 -07:00
..
aarp.c	net: appletalk: fix the usage of preposition	2021-06-08 11:37:41 -07:00
atalk_proc.c	appletalk: Fix atalk_proc_init() return path	2020-08-03 15:48:32 -07:00
ddp.c	net: appletalk: fix some mistakes in grammar	2021-06-08 19:27:57 -07:00
dev.c
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
sysctl_net_atalk.c