From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jul 2015 01:38:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~176^2~1416
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3aa20508a6fe386c2a893027ef4c4ef78ee4eac2;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, tpm_crb: fail when TPM2 ACPI table contents look corrupted
  tpm: Fix initialization of the cdev
---

3aa20508a6fe386c2a893027ef4c4ef78ee4eac2