| commit | 0ddc9e5a112489e1703143ad75b44fc57f9ac25a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 02 15:33:54 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 02 15:33:54 2016 -0700 |
| tree | cff655135a8b06d9b36293b0f83e8c946b7db747 | |
| parent | 601b58699440b421756e5a2b8f3f2211879dd94d [diff] | |
| parent | 4a29b3484f857ff350f203a2d9bf3b428c9e0bf2 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull TPM bugfix from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: tpm: invalid self test error message