Linus Torvalds 1ed55eac3b Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Pull crypto update from Herbert Xu: - Added aesni/avx/x86_64 implementations for camellia. - Optimised AVX code for cast5/serpent/twofish/cast6. - Fixed vmac bug with unaligned input. - Allow compression algorithms in FIPS mode. - Optimised crc32c implementation for Intel. - Misc fixes. * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (32 commits) crypto: caam - Updated SEC-4.0 device tree binding for ERA information. crypto: testmgr - remove superfluous initializers for xts(aes) crypto: testmgr - allow compression algs in fips mode crypto: testmgr - add larger crc32c test vector to test FPU path in crc32c_intel crypto: testmgr - clean alg_test_null entries in alg_test_descs[] crypto: testmgr - remove fips_allowed flag from camellia-aesni null-tests crypto: cast5/cast6 - move lookup tables to shared module padata: use __this_cpu_read per-cpu helper crypto: s5p-sss - Fix compilation error crypto: picoxcell - Add terminating entry for platform_device_id table crypto: omap-aes - select BLKCIPHER2 crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file crypto: tcrypt - add async speed test for camellia cipher crypto: tegra-aes - fix error-valued pointer dereference crypto: tegra - fix missing unlock on error case crypto: cast5/avx - avoid using temporary stack buffers crypto: serpent/avx - avoid using temporary stack buffers crypto: twofish/avx - avoid using temporary stack buffers crypto: cast6/avx - avoid using temporary stack buffers ...		2012-12-15 12:35:19 -08: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	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-10-06 03:16:12 +09:00
ux500	ARM: plat-nomadik: move DMA40 header to <linux/platform_data>	2012-11-05 09:55:32 +01:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-12-15 12:35:19 -08:00
Makefile	crypto: atmel - add Atmel SHA1/SHA256 driver	2012-07-11 11:08:28 +08:00
atmel-aes-regs.h	crypto: atmel - add Atmel AES driver	2012-07-11 11:07:40 +08:00
atmel-aes.c	crypto: remove duplicated include	2012-09-07 04:17:03 +08:00
atmel-sha-regs.h	crypto: atmel - add Atmel SHA1/SHA256 driver	2012-07-11 11:08:28 +08:00
atmel-sha.c	crypto: remove duplicated include	2012-09-07 04:17:03 +08:00
atmel-tdes-regs.h	crypto: atmel - add Atmel DES/TDES driver	2012-07-11 11:08:14 +08:00
atmel-tdes.c	crypto: remove duplicated include	2012-09-07 04:17:03 +08:00
bfin_crc.c	crypto: bfin_crc - CRC hardware driver for BF60x family processors.	2012-06-12 16:37:19 +08:00
geode-aes.c	crypto: geode-aes - Use module_pci_driver	2012-09-07 04:17:03 +08:00
geode-aes.h	[CRYPTO] geode: do not copy the IV too often	2008-01-11 08:16:26 +11:00
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	IXP4xx crypto: MOD_AES{128,192,256} already include key size.	2012-11-22 03:36:15 +00:00
mv_cesa.c	Crypto: CESA: Add support for DT based instantiation.	2012-09-22 14:40:00 +00:00
mv_cesa.h	crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers	2010-04-13 16:50:49 +08:00
n2_asm.S	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
n2_core.c	sparc64: Adjust crypto priorities.	2012-09-15 09:06:30 -07:00
n2_core.h	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
omap-aes.c	ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h	2012-11-30 08:41:50 -08:00
omap-sham.c	ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h	2012-11-30 08:41:50 -08:00
padlock-aes.c	crypto: drivers - remove cra_list initialization	2012-08-01 17:47:28 +08:00
padlock-sha.c	crypto: Add support for x86 cpuid auto loading for x86 crypto drivers	2012-01-26 16:48:10 -08:00
picoxcell_crypto.c	crypto: picoxcell - Add terminating entry for platform_device_id table	2012-11-09 17:32:33 +08:00
picoxcell_crypto_regs.h	crypto: picoxcell - add support for the picoxcell crypto engines	2011-02-21 22:42:40 +11:00
s5p-sss.c	crypto: s5p-sss - Fix compilation error	2012-11-09 17:32:33 +08:00
talitos.c	crypto: talitos - convert to use be16_add_cpu()	2012-10-15 22:18:26 +08:00
talitos.h	crypto: talitos - add sha224, sha384 and sha512 to existing AEAD algorithms	2012-07-11 11:08:29 +08:00
tegra-aes.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-12-15 12:35:19 -08:00
tegra-aes.h	crypto: driver for Tegra AES hardware	2012-01-13 16:38:37 +11:00