Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:13:13 +0000 (07:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:13:13 +0000 (07:13 -0700)
commitb5edfefc65526b34960bbff3477ded477b0328f6
tree6d66cfffa358d024f0b849534d1709763022ca54
parentb14db7abe3501524fd2b1b4ab328239cde42f567
parent02a077c52ef7631275a79862ffd9f3dbe9d38bc2
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  TPM: ReadPubEK output struct fix