original_kernel/drivers/crypto
Linus Torvalds d66e6737d4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto update from Herbert Xu:
 - Optimised AES/SHA1 for ARM.
 - IPsec ESN support in talitos and caam.
 - x86_64/avx implementation of cast5/cast6.
 - Add/use multi-algorithm registration helpers where possible.
 - Added IBM Power7+ in-Nest support.
 - Misc fixes.

Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto
config options being added next to the new ARM ones.

[ Side note: cut-and-paste duplicate help texts make those conflicts
  harder to read than necessary, thanks to git being smart about
  minimizing conflicts and maximizing the common parts... ]

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
  crypto: x86/glue_helper - fix storing of new IV in CBC encryption
  crypto: cast5/avx - fix storing of new IV in CBC encryption
  crypto: tcrypt - add missing tests for camellia and ghash
  crypto: testmgr - make test_aead also test 'dst != src' code paths
  crypto: testmgr - make test_skcipher also test 'dst != src' code paths
  crypto: testmgr - add test vectors for CTR mode IV increasement
  crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)
  crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template
  crypto: caam - increase TRNG clocks per sample
  crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable()
  crypto: tegra-aes - fix error return code
  crypto: crypto4xx - fix error return code
  crypto: hifn_795x - fix error return code
  crypto: ux500 - fix error return code
  crypto: caam - fix error IDs for SEC v5.x RNG4
  hwrng: mxc-rnga - Access data via structure
  hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework
  crypto: caam - add IPsec ESN support
  crypto: 842 - remove .cra_list initialization
  Revert "[CRYPTO] cast6: inline bloat--"
  ...
2012-10-04 09:06:34 -07:00
..
amcc crypto: crypto4xx - fix error return code 2012-09-27 13:32:15 +08:00
caam Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
nx crypto: nx - Remove virt_to_abs() usage in nx-842.c 2012-08-20 16:28:12 +08:00
ux500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
Kconfig crypto: atmel - Remove possible typo error 2012-08-20 16:28:13 +08:00
Makefile
atmel-aes-regs.h
atmel-aes.c crypto: remove duplicated include 2012-09-07 04:17:03 +08:00
atmel-sha-regs.h
atmel-sha.c crypto: remove duplicated include 2012-09-07 04:17:03 +08:00
atmel-tdes-regs.h
atmel-tdes.c crypto: remove duplicated include 2012-09-07 04:17:03 +08:00
bfin_crc.c
geode-aes.c crypto: geode-aes - Use module_pci_driver 2012-09-07 04:17:03 +08:00
geode-aes.h
hifn_795x.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
ixp4xx_crypto.c
mv_cesa.c
mv_cesa.h
n2_asm.S
n2_core.c sparc64: Adjust crypto priorities. 2012-09-15 09:06:30 -07:00
n2_core.h
omap-aes.c
omap-sham.c
padlock-aes.c
padlock-sha.c
picoxcell_crypto.c
picoxcell_crypto_regs.h
s5p-sss.c
talitos.c crypto: talitos - add IPsec ESN support 2012-08-28 23:56:30 +08:00
talitos.h
tegra-aes.c crypto: tegra-aes - fix error return code 2012-09-27 13:32:15 +08:00
tegra-aes.h