| commit | 3aa20508a6fe386c2a893027ef4c4ef78ee4eac2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 15 18:38:24 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 15 18:38:24 2015 -0700 |
| tree | a19c6347c6411adecc3879211ab66bcf4e1aa1f5 | |
| parent | 9090fdb9c95a68a44129d1392f7bd675aec8b0c2 [diff] | |
| parent | 91ef5ccd54a2f22b2593bb6e8c97fc26c74b7f30 [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, tpm_crb: fail when TPM2 ACPI table contents look corrupted tpm: Fix initialization of the cdev