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
..
caif_hsi.c	net: caif: Use netif_rx_any_context()	2020-09-29 14:02:53 -07:00
caif_serial.c	net: caif: fix memory leak in ldisc_open	2021-06-14 12:28:16 -07:00
caif_virtio.c	caif_virtio: Fix some typos in caif_virtio.c	2021-05-21 13:29:49 -07:00
Kconfig	net: caif: Remove unused caif SPI driver	2020-09-29 14:02:53 -07:00
Makefile	net: caif: Remove unused caif SPI driver	2020-09-29 14:02:53 -07:00