diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-13 11:46:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-13 11:46:24 -0700 |
| commit | ee1c7bd33e66376067fd6306b730789ee2ae53e4 (patch) | |
| tree | 5e41e3644225ad523dbdaf0b94cb4685be8f8d0b /mm/huge_memory.c | |
| parent | 60a8db790255a6bebcdc41d97e8084a440398206 (diff) | |
| parent | 2d6c25215ab26bb009de3575faab7b685f138e92 (diff) | |
Merge tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd
Pull tpm fixes from Jarkko Sakkinen:
"One more bug fix for the next release"
* tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd:
KEYS: trusted: allow module init if TPM is inactive or deactivated
Diffstat (limited to 'mm/huge_memory.c')
0 files changed, 0 insertions, 0 deletions