Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Oct 2016 17:10:26 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Oct 2016 17:10:26 +0000 (10:10 -0700)
commit6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd
tree02ebeb5e62438b03ae929d971304a730ba27a465
parent41ec793d2b9bdd6911d4ad8b7378165aba8424d5
parentbefd99656c5eb765fe9d96045c4cba099fd938db
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull TPM fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: remove invalid min length check from tpm_do_selftest()