David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
tls_device_fallback.c	net/tls: export TLS per skb encryption	2019-06-06 14:13:40 -07:00
tls_device.c	net/tls: add kernel-driven resync mechanism for TX	2019-06-11 12:22:27 -07:00
tls_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-25 23:52:29 -04:00
tls_sw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00