David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-02 22:14:21 -04:00
..
Kconfig	tls: convert to generic sk_msg interface	2018-10-15 12:23:19 -07:00
Makefile	net/tls: Add generic NIC offload infrastructure	2018-05-01 09:42:47 -04:00
tls_device_fallback.c	net/tls: avoid NULL pointer deref on nskb->sk in fallback	2019-05-01 11:37:56 -04:00
tls_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04: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-04-25 23:52:29 -04:00