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
..
boot	UAPI: Partition the header include path sets and add uapi/ header directories	2012-10-02 18:01:26 +01:00
configs	x86/Kconfig: Turn off DEBUG_NX_TEST module in defconfigs	2012-09-05 10:43:12 +02:00
crypto	crypto: x86/glue_helper - fix storing of new IV in CBC encryption	2012-10-04 17:45:29 +08:00
ia32	Merge branch 'x86/fpu' into x86/smap	2012-09-21 17:18:44 -07:00
include	Prepared for main script	2012-10-03 13:45:43 -07:00
kernel	UAPI: Partition the header include path sets and add uapi/ header directories	2012-10-02 18:01:26 +01:00
kvm	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 11:10:52 -07:00
lguest
lib	UAPI: x86: Fix insn_sanity build failure after UAPI split	2012-10-02 18:01:56 +01:00
math-emu
mm	Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 13:59:17 -07:00
net	x86: bpf_jit_comp: add XOR instruction for BPF JIT	2012-09-24 16:54:35 -04:00
oprofile	perf/x86/amd: Unify AMD's generic and family 15h pmus	2012-07-05 21:19:41 +02:00
pci	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
platform	efi: Fix the ACPI BGRT driver for images located in EFI boot services memory	2012-09-29 12:21:03 -07:00
power
realmode	x86, suspend: On wakeup always initialize cr4 and EFER	2012-09-26 15:06:22 -07:00
syscalls	UAPI: Plumb the UAPI Kbuilds into the user header installation and checking	2012-10-02 18:01:57 +01:00
tools	UAPI: x86: Fix the test_get_len tool	2012-10-02 18:01:56 +01:00
um	um: Preinclude include/linux/kern_levels.h	2012-09-27 20:20:09 +02:00
vdso	x86, cpu: Rename checking_wrmsrl() to wrmsrl_safe()	2012-06-07 13:32:04 -07:00
video	x86: Use vga_default_device() when determining whether an fb is primary	2012-04-24 09:50:17 +01:00
xen	Features:	2012-10-02 22:09:10 -07:00
.gitignore
Kbuild	x86, realmode: realmode.bin infrastructure	2012-05-08 11:41:48 -07:00
Kconfig	Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 13:59:17 -07:00
Kconfig.cpu	x86/Kconfig: Clean up Kconfig defaults	2012-09-13 17:45:33 +02:00
Kconfig.debug	x86/tlb: add tlb_flushall_shift knob into debugfs	2012-06-27 19:29:10 -07:00
Makefile	Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-09-23 15:40:58 -07:00
Makefile_32.cpu
Makefile.um