MAINTAINERS: update TPM driver infrastructure changes

[[email protected]: alpha-sort CREDITS, per Randy]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Jarkko Sakkinen <[email protected]>
Cc: Marcel Selhorst <[email protected]>
Cc: Ashley Lai <[email protected]>
Cc: Mimi Zohar <[email protected]>
Cc: Jarkko Sakkinen <[email protected]>
Cc: Boris Brezillon <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Håvard Skinnemoen <[email protected]>
Cc: Martin Kepplinger <[email protected]>
Cc: Pavel Machek <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Hans-Christian Noren Egtvedt <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Gertjan van Wingerde <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Randy Dunlap <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/CREDITS b/CREDITS
index 9fbd2c77b5462d71dd9d24b5966c03d528094ce6..a3ec0c744172439331561531dad8eb71ad92f0f2 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23
 S: NL-5216 GP 's-Hertogenbosch
 S: The Netherlands
 
+N: Ashley Lai
+E: [email protected]
+D: IBM VTPM driver
+
 N: Savio Lam
 E: [email protected]
 D: Author of the dialog utility, foundation
@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79
 S: 31134 Hildesheim
 S: Germany
 
+N: Marcel Selhorst
+E: [email protected]
+D: TPM driver
+
 N: Darren Senn
 E: [email protected]
 D: Whatever I notice needs doing (so far: itimers, /proc)
@@ -4128,7 +4136,6 @@ D: MD driver
 D: EISA/sysfs subsystem
 S: France
 
-
 # Don't add your name here, unless you really _are_ after Marc
 # alphabetically. Leonard used to be very proud of being the 
 # last entry, and he'll get positively pissed if he can't even

diff --git a/MAINTAINERS b/MAINTAINERS
index a7995c73772811900890ec7645f22584bec2ce6a..89e5ba530aa3d736523e1f4104229c49b439fa58 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13603,23 +13603,14 @@ F:    drivers/platform/x86/toshiba-wmi.c
 
 TPM DEVICE DRIVER
 M:     Peter Huewe <[email protected]>
-M:     Marcel Selhorst <[email protected]>
 M:     Jarkko Sakkinen <[email protected]>
 R:     Jason Gunthorpe <[email protected]>
-W:     http://tpmdd.sourceforge.net
-L:     [email protected] (moderated for non-subscribers)
-Q:     https://patchwork.kernel.org/project/tpmdd-devel/list/
+L:     [email protected]
+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 <[email protected]>
-W:     http://tpmdd.sourceforge.net
-L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
-F:     drivers/char/tpm/tpm_ibmvtpm*
-
 TRACING
 M:     Steven Rostedt <[email protected]>
 M:     Ingo Molnar <[email protected]>