projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecddad6 4d08a36)
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)
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


Trivial merge
John Crispins staging tree