| commit | eca8dac4fa477cb26eb6478f4a5d2cf381128753 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 09 17:45:34 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 09 17:45:34 2015 -0700 |
| tree | 15a9f2b15492da1f81846d09b8a85a24f84a764d | |
| parent | ecddad64d4ca427c71598cc23183f48bc9cc4568 [diff] | |
| parent | 4d08a3638c80a2817c9fd7dda8c7b812389bd419 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull tpm fixes from James Morris: "fixes for the TPM driver" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: tpm: fix call order in tpm-chip.c tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send