Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 00:25:41 +0000 (16:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 00:25:41 +0000 (16:25 -0800)
commit463eb8ac337bad30ace10835108a56df5817cc76
tree9b12418e1e37a2317eb0d700a703bbca9f462689
parent88cbfd07119e394b9cbb1a4a764056c4b37e8378
parent74b18e1750201530ce285a5cd1269a9fb592d905
Merge branch 'x86-boot-for-linus' of git://git./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
MAINTAINERS