| commit | 3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 18 09:28:24 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 18 09:28:24 2010 -0700 |
| tree | 07082b3239c24799e8aaf2e6a8a0ac059870d34a | |
| parent | c4fd308ed62f292518363ea9c6c2adb3c2d95f9d [diff] | |
| parent | 4bd96a7a8185755b091233b16034c7436cbf57af [diff] |
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