From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Oct 2012 02:29:00 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~3680^2~1815
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d7127dace8cf4b05eb7c8c8531fc204fbb195f4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull TPM bugfixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: Propagate error from tpm_transmit to fix a timeout hang
  driver/char/tpm: fix regression causesd by ppi
---

4d7127dace8cf4b05eb7c8c8531fc204fbb195f4