]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4fd308 4bd96a7)
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 May 2010 16:28:24 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 May 2010 16:28:24 +0000 (09:28 -0700)
commit3ae684e1c48e6deedc9b9faff8fa1c391ca8a652
tree07082b3239c24799e8aaf2e6a8a0ac059870d34atree | snapshot
parentc4fd308ed62f292518363ea9c6c2adb3c2d95f9dcommit | diff
parent4bd96a7a8185755b091233b16034c7436cbf57afcommit | 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
MAINTAINERS diff1 | diff2 | blob | history
Michael's Linux tree.