diff options
author | Marcel Selhorst <m.selhorst@sirrix.com> | 2009-02-11 16:04:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 17:25:35 -0500 |
commit | 7dcce1334fa5879dc12bee001962e8f74bce60f1 (patch) | |
tree | f6c834ed80a629ee11da5eb738f821b74a2adfb1 | |
parent | 508b9f8efdad123b202b228f71f59feba51e4fb5 (diff) |
tpm: correct email address for tpm_infineon-driver
Update my email address.
Signed-off-by: Marcel Selhorst <m.selhorst@sirrix.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | MAINTAINERS | 4 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_infineon.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d5f728f989a..8ee281518c77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4291,8 +4291,8 @@ P: Rajiv Andrade | |||
4291 | M: srajiv@linux.vnet.ibm.com | 4291 | M: srajiv@linux.vnet.ibm.com |
4292 | W: http://tpmdd.sourceforge.net | 4292 | W: http://tpmdd.sourceforge.net |
4293 | P: Marcel Selhorst | 4293 | P: Marcel Selhorst |
4294 | M: tpm@selhorst.net | 4294 | M: m.selhorst@sirrix.com |
4295 | W: http://www.prosec.rub.de/tpm/ | 4295 | W: http://www.sirrix.com |
4296 | L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) | 4296 | L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) |
4297 | S: Maintained | 4297 | S: Maintained |
4298 | 4298 | ||
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index 726ee8a0277f..ecba4942fc8e 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c | |||
@@ -4,7 +4,7 @@ | |||
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 <selhorst@crypto.rub.de> | 7 | * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> |
8 | * Sirrix AG - security technologies, http://www.sirrix.com and | 8 | * Sirrix AG - security technologies, http://www.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.prosec.rub.de/tpm | 10 | * Project-Homepage: http://www.prosec.rub.de/tpm |
@@ -636,7 +636,7 @@ static void __exit cleanup_inf(void) | |||
636 | module_init(init_inf); | 636 | module_init(init_inf); |
637 | module_exit(cleanup_inf); | 637 | module_exit(cleanup_inf); |
638 | 638 | ||
639 | MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); | 639 | MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>"); |
640 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); | 640 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); |
641 | MODULE_VERSION("1.9"); | 641 | MODULE_VERSION("1.9"); |
642 | MODULE_LICENSE("GPL"); | 642 | MODULE_LICENSE("GPL"); |