tree 07082b3239c24799e8aaf2e6a8a0ac059870d34a
parent c4fd308ed62f292518363ea9c6c2adb3c2d95f9d
parent 4bd96a7a8185755b091233b16034c7436cbf57af
author Linus Torvalds <torvalds@linux-foundation.org> 1274200104 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274200104 -0700

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

* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, tboot: Add support for S3 memory integrity protection