Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 494e1a0..9bd4422 100644 (file)
--- 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