tree 754111f5583a34b90babd521bcb68a3cad8a4912
parent a3920a6efa158b445b8a39080b463b9b29337425
parent 59b69ac2bad602d02904d310ee156e47e74d8109
author Linus Torvalds <torvalds@linux-foundation.org> 1350095340 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1350095340 +0900

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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