diff options
author | Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2012-04-24 10:19:58 -0400 |
---|---|---|
committer | Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 2012-06-12 17:53:22 -0400 |
commit | cbb2d5e459f4e10b3f1d11c23c31aa5d7c21e34c (patch) | |
tree | 950acfe4b272e12d17a57e6ebb7243f760a397c3 | |
parent | 66dd07b88a1c9d446f32253da606b87324fa620e (diff) |
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 | |||
6835 | F: mm/shmem.c | 6835 | F: mm/shmem.c |
6836 | 6836 | ||
6837 | TPM DEVICE DRIVER | 6837 | TPM DEVICE DRIVER |
6838 | M: Debora Velarde <debora@linux.vnet.ibm.com> | 6838 | M: Kent Yoder <key@linux.vnet.ibm.com> |
6839 | M: Rajiv Andrade <srajiv@linux.vnet.ibm.com> | 6839 | M: Rajiv Andrade <mail@srajiv.net> |
6840 | W: http://tpmdd.sourceforge.net | 6840 | W: http://tpmdd.sourceforge.net |
6841 | M: Marcel Selhorst <m.selhorst@sirrix.com> | 6841 | M: Marcel Selhorst <tpmdd@selhorst.net> |
6842 | M: Sirrix AG <tpmdd@sirrix.com> | ||
6842 | W: http://www.sirrix.com | 6843 | W: http://www.sirrix.com |
6843 | L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) | 6844 | L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) |
6844 | S: Maintained | 6845 | 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 @@ | |||
4 | * SLD 9630 TT 1.1 and SLB 9635 TT 1.2 Trusted Platform Module | 4 | * SLD 9630 TT 1.1 and SLB 9635 TT 1.2 Trusted Platform Module |
5 | * Specifications at www.trustedcomputinggroup.org | 5 | * Specifications at www.trustedcomputinggroup.org |
6 | * | 6 | * |
7 | * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> | 7 | * Copyright (C) 2005, Marcel Selhorst <tpmdd@selhorst.net> |
8 | * Sirrix AG - security technologies, http://www.sirrix.com and | 8 | * Sirrix AG - security technologies <tpmdd@sirrix.com> and |
9 | * Applied Data Security Group, Ruhr-University Bochum, Germany | 9 | * Applied Data Security Group, Ruhr-University Bochum, Germany |
10 | * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ | 10 | * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ |
11 | * | 11 | * |
@@ -671,7 +671,7 @@ static void __exit cleanup_inf(void) | |||
671 | module_init(init_inf); | 671 | module_init(init_inf); |
672 | module_exit(cleanup_inf); | 672 | module_exit(cleanup_inf); |
673 | 673 | ||
674 | MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>"); | 674 | MODULE_AUTHOR("Marcel Selhorst <tpmdd@sirrix.com>"); |
675 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); | 675 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); |
676 | MODULE_VERSION("1.9.2"); | 676 | MODULE_VERSION("1.9.2"); |
677 | MODULE_LICENSE("GPL"); | 677 | MODULE_LICENSE("GPL"); |