diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 16:25:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 16:25:41 -0800 |
| commit | 463eb8ac337bad30ace10835108a56df5817cc76 (patch) | |
| tree | 9b12418e1e37a2317eb0d700a703bbca9f462689 | |
| parent | 88cbfd07119e394b9cbb1a4a764056c4b37e8378 (diff) | |
| parent | 74b18e1750201530ce285a5cd1269a9fb592d905 (diff) | |
| download | linux-463eb8ac337bad30ace10835108a56df5817cc76.tar.bz2 | |
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
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 233f83464814..026cea8b5a36 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |