The patch titled tpm: correct email address for tpm_infineon-driver has been removed from the -mm tree. Its filename was tpm-correct-email-address-for-tpm_infineon-driver.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tpm: correct email address for tpm_infineon-driver From: Marcel Selhorst <m.selhorst@xxxxxxxxxx> Update my email address. Signed-off-by: Marcel Selhorst <m.selhorst@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- MAINTAINERS | 4 ++-- drivers/char/tpm/tpm_infineon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN MAINTAINERS~tpm-correct-email-address-for-tpm_infineon-driver MAINTAINERS --- a/MAINTAINERS~tpm-correct-email-address-for-tpm_infineon-driver +++ a/MAINTAINERS @@ -4291,8 +4291,8 @@ P: Rajiv Andrade M: srajiv@xxxxxxxxxxxxxxxxxx W: http://tpmdd.sourceforge.net P: Marcel Selhorst -M: tpm@xxxxxxxxxxxx -W: http://www.prosec.rub.de/tpm/ +M: m.selhorst@xxxxxxxxxx +W: http://www.sirrix.com L: tpmdd-devel@xxxxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) S: Maintained diff -puN drivers/char/tpm/tpm_infineon.c~tpm-correct-email-address-for-tpm_infineon-driver drivers/char/tpm/tpm_infineon.c --- a/drivers/char/tpm/tpm_infineon.c~tpm-correct-email-address-for-tpm_infineon-driver +++ a/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@xxxxxxxxxxxxx> + * Copyright (C) 2005, Marcel Selhorst <m.selhorst@xxxxxxxxxx> * 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@xxxxxxxxxxxxx>"); +MODULE_AUTHOR("Marcel Selhorst <m.selhorst@xxxxxxxxxx>"); MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); MODULE_VERSION("1.9"); MODULE_LICENSE("GPL"); _ Patches currently in -mm which might be from m.selhorst@xxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html