diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-31 10:10:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-31 10:10:26 -0700 |
| commit | 6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd (patch) | |
| tree | 02ebeb5e62438b03ae929d971304a730ba27a465 | |
| parent | 41ec793d2b9bdd6911d4ad8b7378165aba8424d5 (diff) | |
| parent | befd99656c5eb765fe9d96045c4cba099fd938db (diff) | |
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()