Linus Torvalds b8716614a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Pull crypto update from Herbert Xu: "* sha512 bug fixes (already in your tree). * SHA224/SHA384 AEAD support in caam. * X86-64 optimised version of Camellia. * Tegra AES support. * Bulk algorithm registration interface to make driver registration easier. * padata race fixes. * Misc fixes." * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits) padata: Fix race on sequence number wrap padata: Fix race in the serialization path crypto: camellia - add assembler implementation for x86_64 crypto: camellia - rename camellia.c to camellia_generic.c crypto: camellia - fix checkpatch warnings crypto: camellia - rename camellia module to camellia_generic crypto: tcrypt - add more camellia tests crypto: testmgr - add more camellia test vectors crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro crypto: twofish-x86_64/i586 - set alignmask to zero crypto: blowfish-x86_64 - set alignmask to zero crypto: serpent-sse2 - combine ablk_*_init functions crypto: blowfish-x86_64 - use crypto_[un]register_algs crypto: twofish-x86_64-3way - use crypto_[un]register_algs crypto: serpent-sse2 - use crypto_[un]register_algs crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init() crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init() crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0 crypto: caam - fix gcc 4.6 warning crypto: Add bulk algorithm registration interface ...		2012-03-21 13:20:43 -07:00
..
boot	x86/boot-image: Don't leak phdrs in arch/x86/boot/compressed/misc.c::Parse_elf()	2012-01-26 11:30:29 +01:00
configs	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-21 13:20:43 -07:00
ia32	aout: move setup_arg_pages() prior to reading/mapping the binary	2012-03-05 13:51:32 -08:00
include/asm	Generialize powerpc's irq_host as irq_domain	2012-03-21 10:27:19 -07:00
kernel	Generialize powerpc's irq_host as irq_domain	2012-03-21 10:27:19 -07:00
kvm	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
lguest	lguest: Make sure interrupt is allocated ok by lguest_setup_irq	2012-01-12 15:44:47 +10:30
lib	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
math-emu
mm	highmem: kill all __kmap_atomic()	2012-03-20 21:48:30 +08:00
net	net: bpf_jit: fix BPF_S_LDX_B_MSH compilation	2012-03-19 17:41:44 -04:00
oprofile	Merge branch 'core' of git://amd64.org/linux/rric into perf/core	2011-11-15 11:05:18 +01:00
pci	x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version	2012-03-01 10:56:37 -08:00
platform	scx200_32: replace printks with pr_<level>s	2012-02-03 23:24:58 +01:00
power	x86: Fix files explicitly requiring export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:35 -04:00
syscalls	x86, syscall: Allow syscall offset to be symbolic	2011-11-18 17:01:19 -08:00
tools	x86/tools: Add decoded instruction dump mode	2011-12-05 14:53:23 +01:00
um	uml: fix compile for x86-64	2012-01-18 19:26:11 -08:00
vdso	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-28 05:03:12 -07:00
video	x86: fix up files really needing to include module.h	2011-10-31 19:30:36 -04:00
xen	xen/pat: Disable PAT support for now.	2012-02-20 10:41:35 -05:00
.gitignore	x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore	2012-01-16 08:21:59 +01:00
Kbuild
Kconfig	Generialize powerpc's irq_host as irq_domain	2012-03-21 10:27:19 -07:00
Kconfig.cpu	mm,x86,um: move CMPXCHG_DOUBLE config option	2012-01-12 20:13:03 -08:00
Kconfig.debug	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-11 19:13:40 -08:00
Makefile	x86: Generate system call tables and unistd_*.h from tables	2011-11-17 13:35:37 -08:00
Makefile_32.cpu
Makefile.um	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01:00