Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Mar 2015 00:45:34 +0000 (17:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Mar 2015 00:45:34 +0000 (17:45 -0700)
commiteca8dac4fa477cb26eb6478f4a5d2cf381128753
tree15a9f2b15492da1f81846d09b8a85a24f84a764d
parentecddad64d4ca427c71598cc23183f48bc9cc4568
parent4d08a3638c80a2817c9fd7dda8c7b812389bd419
Merge branch 'for-linus' of git://git./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