1
0
Fork 0
remarkable-linux/drivers/crypto
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-12 15:52:44 -07:00
..
amcc crypto4xx: integrate ppc4xx-rng into crypto4xx 2016-04-20 17:50:02 +08:00
caam crypto: caam - fix IV loading for authenc (giv)decryption 2016-08-31 22:50:42 +08:00
ccp crypto: ccp - Use skcipher for fallback 2016-07-01 23:45:08 +08:00
chelsio chcr: Fix non static symbol warning 2016-08-26 21:45:07 -07:00
marvell crypto: marvell - Don't copy IV vectors from the _process op for ciphers 2016-07-29 18:30:17 +08:00
nx crypto: nx - off by one bug in nx_of_update_msc() 2016-07-19 12:01:47 +08:00
qat crypto: qat - fix aes-xts key sizes 2016-08-24 20:51:19 +08:00
qce crypto: qce - Use skcipher for fallback 2016-07-01 23:45:09 +08:00
rockchip crypto: rockchip - add hash support for crypto engine in rk3288 2016-02-28 03:26:29 +08:00
sunxi-ss crypto: sun4i-ss - Replace spinlock_bh by spin_lock_irq{save|restore} 2016-04-05 20:35:53 +08:00
ux500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2016-07-21 12:26:55 +08:00
vmx crypto: vmx - fix null dereference in p8_aes_xts_crypt 2016-08-24 20:51:20 +08:00
Kconfig crypto: Added Chelsio Menu to the Kconfig file 2016-08-19 00:00:37 -07:00
Makefile crypto: Added Chelsio Menu to the Kconfig file 2016-08-19 00:00:37 -07:00
atmel-aes-regs.h
atmel-aes.c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2016-03-17 11:22:54 -07:00
atmel-sha-regs.h crypto: atmel-sha - fix context switches 2016-01-25 22:42:07 +08:00
atmel-sha.c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2016-03-17 11:22:54 -07:00
atmel-tdes-regs.h
atmel-tdes.c crypto: atmel - fix checks of error code returned by devm_ioremap_resource() 2016-03-11 21:19:19 +08:00
bfin_crc.c crypto: bfin_crc - Simplify use of devm_ioremap_resource 2016-07-05 23:05:24 +08:00
bfin_crc.h
geode-aes.c
geode-aes.h
hifn_795x.c crypto: hifn_795x, picoxcell - use ablkcipher_request_cast 2015-12-29 21:32:44 +08:00
img-hash.c
ixp4xx_crypto.c crypto: ixp4xx - Fix false lastlen uninitialised warning 2016-01-25 22:42:09 +08:00
mv_cesa.c
mv_cesa.h
mxc-scc.c crypto: mxc-scc - fix unwinding in mxc_scc_crypto_register() 2016-04-25 19:14:53 +08:00
mxs-dcp.c crypto: mxs-dcp - Use skcipher for fallback 2016-07-01 23:45:08 +08:00
n2_asm.S
n2_core.c crypto: n2 - Remove return statement from void function 2016-04-05 20:35:44 +08:00
n2_core.h
omap-aes.c crypto: omap - Stop using crypto scatterwalk_bytes_sglen 2016-07-18 17:35:48 +08:00
omap-des.c crypto: omap - Stop using crypto scatterwalk_bytes_sglen 2016-07-18 17:35:48 +08:00
omap-sham.c crypto: omap-sham - increase cra_proirity to 400 2016-07-01 23:45:22 +08:00
padlock-aes.c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2016-01-12 18:51:14 -08:00
padlock-sha.c
picoxcell_crypto.c crypto: picoxcell - Use skcipher for fallback 2016-07-01 23:45:09 +08:00
picoxcell_crypto_regs.h
s5p-sss.c crypto: s5p-sss - Use consistent indentation for variables and members 2016-05-31 17:52:30 +08:00
sahara.c crypto: sahara - Use skcipher for fallback 2016-07-01 23:45:10 +08:00
talitos.c crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU 2016-06-08 16:20:04 +08:00
talitos.h