| commit | 4d7127dace8cf4b05eb7c8c8531fc204fbb195f4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 13 11:29:00 2012 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 13 11:29:00 2012 +0900 |
| tree | 754111f5583a34b90babd521bcb68a3cad8a4912 | |
| parent | a3920a6efa158b445b8a39080b463b9b29337425 [diff] | |
| parent | 59b69ac2bad602d02904d310ee156e47e74d8109 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull TPM bugfixes from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: tpm: Propagate error from tpm_transmit to fix a timeout hang driver/char/tpm: fix regression causesd by ppi