David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
Kconfig	net/tls: Add generic NIC offload infrastructure	2018-05-01 09:42:47 -04:00
Makefile	net/tls: Add generic NIC offload infrastructure	2018-05-01 09:42:47 -04:00
tls_device.c	tls: Fix copy-paste error in tls_device_reencrypt	2018-07-20 12:12:45 -07:00
tls_device_fallback.c	tls: Add rx inline crypto offload	2018-07-16 00:13:11 -07:00
tls_main.c	tls: Add rx inline crypto offload	2018-07-16 00:13:11 -07:00
tls_sw.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00