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
..
acpi	Prepared for main script	2012-10-03 13:45:43 -07:00
asm-generic	Prepared for main script	2012-10-03 13:45:43 -07:00
clocksource	arm64: Generic timers support	2012-09-17 13:42:20 +01:00
crypto	crypto: cast6 - fix sparse warnings (symbol was not declared, should be static?)	2012-09-07 04:17:06 +08:00
drm	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
math-emu
media
memory
misc
mtd	UBI: add max_beb_per1024 to attach ioctl	2012-09-04 09:39:01 +03:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
pcmcia
ras
rdma	IB/core: Add ib_find_exact_cached_pkey()	2012-09-30 20:33:30 -07:00
rxrpc
scsi	Prepared for main script	2012-10-03 13:45:43 -07:00
sound	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
target	target: support zero allocation length in REQUEST SENSE	2012-09-07 11:14:21 -07:00
trace	UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers	2012-10-02 18:01:25 +01:00
uapi	UAPI: Plumb the UAPI Kbuilds into the user header installation and checking	2012-10-02 18:01:57 +01:00
video	ARM: clps711x: Remove board support for CEIVA	2012-09-28 21:14:08 +02:00
xen	Prepared for main script	2012-10-03 13:45:43 -07:00
Kbuild