commit | b5edfefc65526b34960bbff3477ded477b0328f6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:13:13 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:13:13 2010 -0700 |
tree | 6d66cfffa358d024f0b849534d1709763022ca54 | |
parent | b14db7abe3501524fd2b1b4ab328239cde42f567 [diff] | |
parent | 02a077c52ef7631275a79862ffd9f3dbe9d38bc2 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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