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
..
appldata	s390/vtimer: rework virtual timer interface	2012-07-20 11:15:08 +02:00
boot	s390/ipl,decrompressor: disable branch profiling	2012-09-26 15:45:21 +02:00
crypto	crypto: arch/s390 - cleanup - remove unneeded cra_list initialization	2012-08-01 17:47:29 +08:00
hypfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-10-02 20:25:04 -07:00
include	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-10-02 11:11:09 -07:00
kvm	s390/sysinfo,stsi: change return code handling	2012-09-26 15:45:12 +02:00
lib	s390/string: provide asm lib functions for memcpy and memcmp	2012-09-26 15:44:50 +02:00
math-emu	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
mm	s390/mm: mark free_initrd_mem() as __init	2012-09-26 15:45:27 +02:00
net	s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction	2012-09-26 15:45:28 +02:00
oprofile	oprofile, s390: Fix uninitialized memory access when writing to oprofilefs	2012-08-27 14:49:23 +02:00
defconfig	s390: update defconfig	2012-09-26 15:45:29 +02:00
Kbuild	s390/bpf,jit: BPF Just In Time compiler for s390	2012-09-26 15:44:49 +02:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-10-01 11:49:56 -07:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	s390: Use generic init_task	2012-05-05 13:00:25 +02:00