Pull misc-for-upstream into release branch

[linux-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f3a79d4ef7fd612888411a137da3495ca59c504b..dd6978b1e8fbcbde19e874828a16bdb3100e6f7a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3102,6 +3102,9 @@ TPM DEVICE DRIVER
 P:     Kylene Hall
 M:     kjhall@us.ibm.com
 W:     http://tpmdd.sourceforge.net
+P:     Marcel Selhorst
+M:     tpm@selhorst.net
+W:     http://www.prosec.rub.de/tpm/
 L:     tpmdd-devel@lists.sourceforge.net
 S:     Maintained