X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=MAINTAINERS;h=3d2651bffaddb0ff1c5111e7ea04f5933d726d1f;hb=87f44bbc246c5244c76a701f8eefba7788bce64a;hp=28332e1b0863c2b19e86c913f3508b20db97a502;hpb=07d77759c95d899b84f8e473a01cff001019dd5f;p=deliverable%2Flinux.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 28332e1b0863..3d2651bffadd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2953,6 +2953,17 @@ S:	Odd Fixes
 F:	Documentation/networking/README.ipw2200
 F:	drivers/net/wireless/ipw2x00/ipw2200.*
 
+INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
+M:	Joseph Cihula <joseph.cihula@intel.com>
+M:	Shane Wang <shane.wang@intel.com>
+L:	tboot-devel@lists.sourceforge.net
+W:	http://tboot.sourceforge.net
+T:	Mercurial http://www.bughost.org/repos.hg/tboot.hg
+S:	Supported
+F:	Documentation/intel_txt.txt
+F:	include/linux/tboot.h
+F:	arch/x86/kernel/tboot.c
+
 INTEL WIRELESS WIMAX CONNECTION 2400
 M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:	linux-wimax@intel.com