diff options
| author | Marcel Selhorst <m.selhorst@sirrix.com> | 2009-02-11 22:04:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 23:25:35 +0100 |
| commit | 7dcce1334fa5879dc12bee001962e8f74bce60f1 (patch) | |
| tree | f6c834ed80a629ee11da5eb738f821b74a2adfb1 | |
| parent | mm: fix mlocked page counter mismatch (diff) | |
| download | linux-7dcce1334fa5879dc12bee001962e8f74bce60f1.tar.xz linux-7dcce1334fa5879dc12bee001962e8f74bce60f1.zip | |
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 M: srajiv@linux.vnet.ibm.com W: http://tpmdd.sourceforge.net P: Marcel Selhorst -M: tpm@selhorst.net -W: http://www.prosec.rub.de/tpm/ +M: m.selhorst@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 726ee8a0277f..ecba4942fc8e 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c @@ -4,7 +4,7 @@ * SLD 9630 TT 1.1 and SLB 9635 TT 1.2 Trusted Platform Module * Specifications at www.trustedcomputinggroup.org * - * Copyright (C) 2005, Marcel Selhorst <selhorst@crypto.rub.de> + * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> * Sirrix AG - security technologies, http://www.sirrix.com and * Applied Data Security Group, Ruhr-University Bochum, Germany * Project-Homepage: http://www.prosec.rub.de/tpm @@ -636,7 +636,7 @@ static void __exit cleanup_inf(void) module_init(init_inf); module_exit(cleanup_inf); -MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); +MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>"); MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); MODULE_VERSION("1.9"); MODULE_LICENSE("GPL"); |