raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-12 04:49:54 +00:00
Code Issues Projects Releases Wiki Activity
Files
1af7e7f8c12f521c111bd7cf0d138be7e15b51a5
linux/include/net/tls.h
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

21 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink