diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:30:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:30:50 -0700 |
commit | 7f3143702cc0d433c183d7b361b1316f2dcf8464 (patch) | |
tree | 8454228d61b73d3a57c0717e667e2d94e692d04f /init | |
parent | 4047df09a1581284218cb378208a87eaa36f2d2c (diff) | |
parent | 15d031c394e7bef9da4ec764e6b0330d701a0126 (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: fix pcrread
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions