Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 88ae0eca7cd838c36be4657f46000e6fbc56e404..5c214024f60a8c84accdac11ff95609128e41a4e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8746,14 +8746,10 @@ S:      Odd fixes
 F:     drivers/media/usb/tm6000/
 
 TPM DEVICE DRIVER
-M:     Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
-M:     Ashley Lai <ashley@ashleylai.com>
 M:     Peter Huewe <peterhuewe@gmx.de>
-M:     Rajiv Andrade <mail@srajiv.net>
-W:     http://tpmdd.sourceforge.net
+M:     Ashley Lai <ashley@ashleylai.com>
 M:     Marcel Selhorst <tpmdd@selhorst.net>
-M:     Sirrix AG <tpmdd@sirrix.com>
-W:     http://www.sirrix.com
+W:     http://tpmdd.sourceforge.net
 L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/char/tpm/