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

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
...@@ -5622,9 +5622,7 @@ F: Documentation/trace/intel_th.txt ...@@ -5622,9 +5622,7 @@ F: Documentation/trace/intel_th.txt
F: drivers/hwtracing/intel_th/ F: drivers/hwtracing/intel_th/
INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
M: Richard L Maliszewski <richard.l.maliszewski@intel.com> M: Ning Sun <ning.sun@intel.com>
M: Gang Wei <gang.wei@intel.com>
M: Shane Wang <shane.wang@intel.com>
L: tboot-devel@lists.sourceforge.net L: tboot-devel@lists.sourceforge.net
W: http://tboot.sourceforge.net W: http://tboot.sourceforge.net
T: hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot T: hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment