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


Trivial merge