From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 16:28:24 +0000 (-0700)
Subject: Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~507
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ae684e1c48e6deedc9b9faff8fa1c391ca8a652;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'x86-txt-for-linus' of git://git./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
---

3ae684e1c48e6deedc9b9faff8fa1c391ca8a652