diff options
| author | Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2012-04-24 16:19:58 +0200 |
|---|---|---|
| committer | Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2012-06-12 23:53:22 +0200 |
| commit | cbb2d5e459f4e10b3f1d11c23c31aa5d7c21e34c (patch) | |
| tree | 950acfe4b272e12d17a57e6ebb7243f760a397c3 | |
| parent | Merge commit 'v3.5-rc2' into next (diff) | |
| download | linux-cbb2d5e459f4e10b3f1d11c23c31aa5d7c21e34c.tar.xz linux-cbb2d5e459f4e10b3f1d11c23c31aa5d7c21e34c.zip | |
MAINTAINERS: TPM maintainers' contacts update
Usual contact update, Debora Velarde role resign, and the new
co-maintainer inclusion, Kent Yoder. He's accepted to contribute
more actively to this driver's maintainership given the current
maintainer's slight career change that will affect his contribution
time.
[Replacing Debora Velarde by Kent Yoder]
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm_infineon.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 14bc7071f9df..58f5a7fbf67d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6835,10 +6835,11 @@ F: include/linux/shmem_fs.h F: mm/shmem.c TPM DEVICE DRIVER -M: Debora Velarde <debora@linux.vnet.ibm.com> -M: Rajiv Andrade <srajiv@linux.vnet.ibm.com> +M: Kent Yoder <key@linux.vnet.ibm.com> +M: Rajiv Andrade <mail@srajiv.net> W: http://tpmdd.sourceforge.net -M: Marcel Selhorst <m.selhorst@sirrix.com> +M: Marcel Selhorst <tpmdd@selhorst.net> +M: Sirrix AG <tpmdd@sirrix.com> W: http://www.sirrix.com L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index 76da32e11f18..3251a44e8ceb 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c @@ -4,8 +4,8 @@ * SLD 9630 TT 1.1 and SLB 9635 TT 1.2 Trusted Platform Module * Specifications at www.trustedcomputinggroup.org * - * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> - * Sirrix AG - security technologies, http://www.sirrix.com and + * Copyright (C) 2005, Marcel Selhorst <tpmdd@selhorst.net> + * Sirrix AG - security technologies <tpmdd@sirrix.com> and * Applied Data Security Group, Ruhr-University Bochum, Germany * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ * @@ -671,7 +671,7 @@ static void __exit cleanup_inf(void) module_init(init_inf); module_exit(cleanup_inf); -MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>"); +MODULE_AUTHOR("Marcel Selhorst <tpmdd@sirrix.com>"); MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); MODULE_VERSION("1.9.2"); MODULE_LICENSE("GPL"); |