aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Selhorst <m.selhorst@sirrix.com>2009-02-11 16:04:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 17:25:35 -0500
commit7dcce1334fa5879dc12bee001962e8f74bce60f1 (patch)
treef6c834ed80a629ee11da5eb738f821b74a2adfb1
parent508b9f8efdad123b202b228f71f59feba51e4fb5 (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--MAINTAINERS4
-rw-r--r--drivers/char/tpm/tpm_infineon.c4
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
4291M: srajiv@linux.vnet.ibm.com 4291M: srajiv@linux.vnet.ibm.com
4292W: http://tpmdd.sourceforge.net 4292W: http://tpmdd.sourceforge.net
4293P: Marcel Selhorst 4293P: Marcel Selhorst
4294M: tpm@selhorst.net 4294M: m.selhorst@sirrix.com
4295W: http://www.prosec.rub.de/tpm/ 4295W: http://www.sirrix.com
4296L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) 4296L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
4297S: Maintained 4297S: 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)
636module_init(init_inf); 636module_init(init_inf);
637module_exit(cleanup_inf); 637module_exit(cleanup_inf);
638 638
639MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); 639MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>");
640MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); 640MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");
641MODULE_VERSION("1.9"); 641MODULE_VERSION("1.9");
642MODULE_LICENSE("GPL"); 642MODULE_LICENSE("GPL");