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
..
alpha	Prepared for main script	2012-10-03 13:45:43 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
arm64	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
avr32	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
blackfin	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
c6x	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
cris	Prepared for main script	2012-10-03 13:45:43 -07:00
frv	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
h8300	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
hexagon	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
ia64	Prepared for main script	2012-10-03 13:45:43 -07:00
m32r	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
m68k	Prepared for main script	2012-10-03 13:45:43 -07:00
microblaze	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
mips	Prepared for main script	2012-10-03 13:45:43 -07:00
mn10300	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
openrisc	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
parisc	Prepared for main script	2012-10-03 13:45:43 -07:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
score	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
sh	Prepared for main script	2012-10-03 13:45:43 -07:00
sparc	Prepared for main script	2012-10-03 13:45:43 -07:00
tile	Prepared for main script	2012-10-03 13:45:43 -07:00
um	Prepared for main script	2012-10-03 13:45:43 -07:00
unicore32	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
xtensa	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
.gitignore
Kconfig	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 10:43:39 -07:00