Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> --- CREDITS | 7 +++++++ MAINTAINERS | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CREDITS b/CREDITS index 5d09c26d69cd..dcd761885ea8 100644 --- a/CREDITS +++ b/CREDITS @@ -4130,6 +4130,13 @@ D: MD driver D: EISA/sysfs subsystem S: France +N: Marcel Selhorst +E: tpmdd@xxxxxxxxxxxx +D: TPM driver + +N: Ashley Lai +E: ashleydlai@xxxxxxxxx +D: IBM VTPM driver # Don't add your name here, unless you really _are_ after Marc # alphabetically. Leonard used to be very proud of being the diff --git a/MAINTAINERS b/MAINTAINERS index dfca9a4f1112..00f0610c3ec9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13291,23 +13291,14 @@ F: drivers/platform/x86/toshiba-wmi.c TPM DEVICE DRIVER M: Peter Huewe <peterhuewe@xxxxxx> -M: Marcel Selhorst <tpmdd@xxxxxxxxxxxx> M: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> R: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx> -W: http://tpmdd.sourceforge.net -L: tpmdd-devel@xxxxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) -Q: https://patchwork.kernel.org/project/tpmdd-devel/list/ +L: linux-integrity@xxxxxxxxxxxxxxx +Q: https://patchwork.kernel.org/project/linux-integrity/list/ T: git git://git.infradead.org/users/jjs/linux-tpmdd.git S: Maintained F: drivers/char/tpm/ -TPM IBM_VTPM DEVICE DRIVER -M: Ashley Lai <ashleydlai@xxxxxxxxx> -W: http://tpmdd.sourceforge.net -L: tpmdd-devel@xxxxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) -S: Maintained -F: drivers/char/tpm/tpm_ibmvtpm* - TRACING M: Steven Rostedt <rostedt@xxxxxxxxxxx> M: Ingo Molnar <mingo@xxxxxxxxxx> -- 2.14.1
