Linus Torvalds 332a339218 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: (102 commits) crypto: sha-s390 - Fix warnings in import function crypto: vmac - New hash algorithm for intel_txt support crypto: api - Do not displace newly registered algorithms crypto: ansi_cprng - Fix module initialization crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx crypto: fips - Depend on ansi_cprng crypto: blkcipher - Do not use eseqiv on stream ciphers crypto: ctr - Use chainiv on raw counter mode Revert crypto: fips - Select CPRNG crypto: rng - Fix typo crypto: talitos - add support for 36 bit addressing crypto: talitos - align locks on cache lines crypto: talitos - simplify hmac data size calculation crypto: mv_cesa - Add support for Orion5X crypto engine crypto: cryptd - Add support to access underlaying shash crypto: gcm - Use GHASH digest algorithm crypto: ghash - Add GHASH digest algorithm for GCM crypto: authenc - Convert to ahash crypto: api - Fix aligned ctx helper crypto: hmac - Prehash ipad/opad ...		2009-09-11 09:38:37 -07:00
..
appldata	[S390] pm: appldata power management callbacks	2009-06-16 10:31:15 +02:00
boot	[PATCH] use ${CROSS_COMPILE}installkernel in arch/*/boot/install.sh	2005-06-23 09:45:07 -07:00
crypto	crypto: sha-s390 - Fix warnings in import function	2009-09-05 16:27:35 +10:00
hypfs	[S390] hypfs: Use "%u" instead of "%d" for unsigned ints in snprintf	2009-09-11 10:29:51 +02:00
include/asm	[S390] Remove smp_cpu_not_running.	2009-09-11 10:29:56 +02:00
kernel	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2009-09-11 09:16:39 -07:00
kvm	Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-08-09 14:58:21 -07:00
lib	[S390] add __ucmpdi2() helper function	2009-07-07 16:37:53 +02:00
math-emu	[S390] remove -traditional	2008-04-30 13:38:44 +02:00
mm	[S390] Wire up page fault events for software perf counters.	2009-09-11 10:29:56 +02:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
defconfig	[S390] Update default configuration.	2009-06-22 12:08:25 +02:00
Kconfig	[S390] Enable guest page hinting by default.	2009-09-11 10:29:54 +02:00
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile	[S390] hibernation: merge files and move to kernel/	2009-09-11 10:29:45 +02:00