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
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	ethernet: renesas: convert to SPDX identifiers	2018-09-10 10:11:53 -07:00
ravb_main.c	net: ethernet: ravb: Use devm_platform_get_and_ioremap_resource()	2021-06-09 13:51:11 -07:00
ravb_ptp.c	ptp: Introduce strict checking of external time stamp options.	2019-11-15 12:48:32 -08:00
ravb.h	net: ethernet: ravb: Enable optional refclk	2021-04-12 14:09:59 -07:00
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-06-18 19:47:02 -07:00
sh_eth.h	sh_eth: place RX/TX descriptor *enum*s after their *struct*s	2021-03-12 17:50:42 -08:00