From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Oct 2016 17:10:26 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v4.9-rc4~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd;p=users%2Fjedix%2Flinux-maple.git

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

6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd