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:
  crypto: Makefile - replace the use of <module>-objs with <module>-y
  crypto: hifn_795x - use cancel_delayed_work_sync()
  crypto: talitos - sparse check endian fixes
  crypto: talitos - fix checkpatch warning
  crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
  crypto: cryptd - Adding the AEAD interface type support to cryptd
  crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
  crypto: Kconfig - update broken web addresses
  crypto: omap-sham - Adjust DMA parameters
  crypto: fips - FIPS requires algorithm self-tests
  crypto: omap-aes - OMAP2/3 AES hw accelerator driver
  crypto: updates to enable omap aes
  padata: add missing __percpu markup in include/linux/padata.h
  MAINTAINERS: Add maintainer entries for padata/pcrypt

1 files changed, 16 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 494e1a07366a..9bd4422618e9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4453,6 +4453,15 @@ L:	linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/i2c/busses/i2c-pasemi.c
 
+PADATA PARALLEL EXECUTION MECHANISM
+M:      Steffen Klassert <steffen.klassert@secunet.com>
+L:      linux-kernel@vger.kernel.org
+L:      linux-crypto@vger.kernel.org
+S:      Maintained
+F:      kernel/padata.c
+F:      include/linux/padata.h
+F:      Documentation/padata.txt
+
 PANASONIC LAPTOP ACPI EXTRAS DRIVER
 M:      Harald Welte <laforge@gnumonks.org>
 L:      platform-driver-x86@vger.kernel.org
@@ -4580,6 +4589,13 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/pcnet32.c
 
+PCRYPT PARALLEL CRYPTO ENGINE
+M:      Steffen Klassert <steffen.klassert@secunet.com>
+L:      linux-crypto@vger.kernel.org
+S:      Maintained
+F:      crypto/pcrypt.c
+F:      include/crypto/pcrypt.h
+
 PER-TASK DELAY ACCOUNTING
 M:      Balbir Singh <balbir@linux.vnet.ibm.com>
 S:      Maintained