diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-17 11:51:33 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-17 11:51:33 +1000 |
commit | 69da0b9928e4b0db61d657a87e513b85acc990b8 (patch) | |
tree | 605a2842ef79dd1e0182f27f0bd3aed8ebcf56a5 /MAINTAINERS | |
parent | c8c7ffbd8d140f9933f8f966c5d6cc0d808d3b21 (diff) | |
parent | 48fc267ee6f34f67db42a49f386fdd367cac6f8a (diff) |
Merge remote branch 'crypto/master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 22e4eccb9937..fe7621792369 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4349,6 +4349,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 @@ -4476,6 +4485,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 |