From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Mar 2015 00:45:34 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eca8dac4fa477cb26eb6478f4a5d2cf381128753;p=openwrt%2Fstaging%2Fblogic.git

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
---

eca8dac4fa477cb26eb6478f4a5d2cf381128753