Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Sep 2016 22:33:54 +0000 (15:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Sep 2016 22:33:54 +0000 (15:33 -0700)
commit0ddc9e5a112489e1703143ad75b44fc57f9ac25a
treecff655135a8b06d9b36293b0f83e8c946b7db747
parent601b58699440b421756e5a2b8f3f2211879dd94d
parent4a29b3484f857ff350f203a2d9bf3b428c9e0bf2
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull TPM bugfix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: invalid self test error message