Commit 463eb8ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull small x86 boot update from Ingo Molnar:
 "A single update to the MAINTAINERS file"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tboot: Update maintainer list for Intel TXT
parents 88cbfd07 74b18e17

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -5622,9 +5622,7 @@ F: Documentation/trace/intel_th.txt 
F:	drivers/hwtracing/intel_th/



INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)

M:	Richard L Maliszewski <richard.l.maliszewski@intel.com>

M:	Gang Wei <gang.wei@intel.com>

M:	Shane Wang <shane.wang@intel.com>

M:	Ning Sun <ning.sun@intel.com>

L:	tboot-devel@lists.sourceforge.net

W:	http://tboot.sourceforge.net

T:	hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot