David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
chtls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
chcr_algo.c	crypto: chelsio - Update ntx queue received from cxgb4	2018-10-17 14:16:19 +08:00
chcr_algo.h	crypt: chelsio - Send IV as Immediate for cipher algo	2018-05-31 00:13:48 +08:00
chcr_core.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-10-25 16:43:35 -07:00
chcr_core.h	crypt: chelsio - Send IV as Immediate for cipher algo	2018-05-31 00:13:48 +08:00
chcr_crypto.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-10-17 14:14:06 +08:00
chcr_ipsec.c	drivers: chelsio: use skb_sec_path helper	2018-12-19 11:21:38 -08:00
Kconfig	crypto: chtls - Makefile Kconfig	2018-03-31 23:37:33 -04:00
Makefile	crypto: chtls - Makefile Kconfig	2018-03-31 23:37:33 -04:00