Linus Torvalds a23a334bd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (34 commits) crypto: caam - ablkcipher support crypto: caam - faster aead implementation crypto: caam - structure renaming crypto: caam - shorter names crypto: talitos - don't bad_key in ablkcipher setkey crypto: talitos - remove unused giv from ablkcipher methods crypto: talitos - don't set done notification in hot path crypto: talitos - ensure request ordering within a single tfm crypto: gf128mul - fix call to memset() crypto: s390 - support hardware accelerated SHA-224 crypto: algif_hash - Handle initial af_alg_make_sg error correctly crypto: sha1_generic - use SHA1_BLOCK_SIZE hwrng: ppc4xx - add support for ppc4xx TRNG crypto: crypto4xx - Perform read/modify/write on device control register crypto: caam - fix build warning when DEBUG_FS not configured crypto: arc4 - Fixed coding style issues crypto: crc32c - Fixed coding style issue crypto: omap-sham - do not schedule tasklet if there is no active requests crypto: omap-sham - clear device flags when finishing request crypto: omap-sham - irq handler must not clear error code ...		2011-07-24 09:05:32 -07:00
..
appldata	[S390] mm: add ZONE_DMA to 31-bit config again	2011-05-26 09:48:25 +02:00
boot	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-03-20 18:14:55 -07:00
crypto	crypto: s390 - support hardware accelerated SHA-224	2011-07-04 20:06:01 +08:00
hypfs	treewide: remove extra semicolons	2011-04-10 17:01:05 +02:00
include/asm	[S390] fix kvm defines for 31 bit compile	2011-06-06 14:14:56 +02:00
kernel	Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc	2011-07-22 15:06:50 -07:00
kvm	virtio: expose for non-virtualization users too	2011-07-23 16:20:30 +09:30
lib	[S390] delay: implement ndelay	2011-05-26 09:48:25 +02:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	perf: Remove the nmi parameter from the swevent and overflow interface	2011-07-01 11:06:35 +02:00
oprofile	[S390] hwsampler: Set a sane default sampling rate	2011-06-22 16:24:20 +02:00
defconfig	[S390] Update default configuration	2011-01-12 09:55:24 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	[S390] kvm-s390: fix kconfig dependencies	2011-06-22 16:24:19 +02:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00