diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:09:54 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:09:54 +1000 |
commit | d5cad12c8ec2e1f13c2445201a4190f150b6167a (patch) | |
tree | a9689a71d8bc3a7f216d7ad5776909978ab156bc | |
parent | 079df2889e908696c8c7aa656bfb5b958b324070 (diff) | |
parent | 48fc267ee6f34f67db42a49f386fdd367cac6f8a (diff) |
Merge remote branch 'crypto/master'
-rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6b8dca919c84..31204944d2f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4358,6 +4358,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 @@ -4485,6 +4494,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 |