From 0b26993bfd9e57b2ec73faa53b66e99b98da791c Mon Sep 17 00:00:00 2001 From: Rajiv Andrade Date: Tue, 24 Apr 2012 11:19:58 -0300 Subject: [PATCH] --- yaml --- r: 313604 b: refs/heads/master c: cbb2d5e459f4e10b3f1d11c23c31aa5d7c21e34c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 7 ++++--- trunk/drivers/char/tpm/tpm_infineon.c | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b408fd5c4d23..931a8cff3831 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66dd07b88a1c9d446f32253da606b87324fa620e +refs/heads/master: cbb2d5e459f4e10b3f1d11c23c31aa5d7c21e34c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 14bc7071f9df..58f5a7fbf67d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6835,10 +6835,11 @@ F: include/linux/shmem_fs.h F: mm/shmem.c TPM DEVICE DRIVER -M: Debora Velarde -M: Rajiv Andrade +M: Kent Yoder +M: Rajiv Andrade W: http://tpmdd.sourceforge.net -M: Marcel Selhorst +M: Marcel Selhorst +M: Sirrix AG W: http://www.sirrix.com L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained diff --git a/trunk/drivers/char/tpm/tpm_infineon.c b/trunk/drivers/char/tpm/tpm_infineon.c index 76da32e11f18..3251a44e8ceb 100644 --- a/trunk/drivers/char/tpm/tpm_infineon.c +++ b/trunk/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 - * Sirrix AG - security technologies, http://www.sirrix.com and + * Copyright (C) 2005, Marcel Selhorst + * Sirrix AG - security technologies 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 "); +MODULE_AUTHOR("Marcel Selhorst "); MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); MODULE_VERSION("1.9.2"); MODULE_LICENSE("GPL");