David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
amcc	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
axis
bcm	crypto: bcm - convert to use crypto_authenc_extractkeys()	2019-01-10 21:37:31 +08:00
caam	crypto: caam - fix SHA support detection	2019-01-10 21:37:31 +08:00
cavium	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-01-31 23:09:00 -08:00
ccp	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
ccree	crypto: ccree - convert to use crypto_authenc_extractkeys()	2019-01-10 21:37:31 +08:00
chelsio	net/tls: free ctx in sock destruct	2019-01-22 11:30:54 -08:00
hisilicon	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
inside-secure
marvell
mediatek	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
nx
qat	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
qce
rockchip
stm32
sunxi-ss
ux500
virtio
vmx
atmel-aes-regs.h
atmel-aes.c
atmel-authenc.h
atmel-ecc.c
atmel-ecc.h
atmel-sha-regs.h
atmel-sha.c
atmel-tdes-regs.h
atmel-tdes.c
exynos-rng.c
geode-aes.c
geode-aes.h
hifn_795x.c
img-hash.c
ixp4xx_crypto.c	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
Kconfig	crypto: bcm - convert to use crypto_authenc_extractkeys()	2019-01-10 21:37:31 +08:00
Makefile
mxc-scc.c
mxs-dcp.c
n2_asm.S
n2_core.c
n2_core.h
omap-aes-gcm.c
omap-aes.c
omap-aes.h
omap-crypto.c
omap-crypto.h
omap-des.c
omap-sham.c
padlock-aes.c
padlock-sha.c
picoxcell_crypto_regs.h
picoxcell_crypto.c
qcom-rng.c
s5p-sss.c
sahara.c
talitos.c	crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK	2019-01-10 21:37:32 +08:00
talitos.h