projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 60a8db7 2d6c252)
Merge tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Aug 2019 18:46:24 +0000 (11:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Aug 2019 18:46:24 +0000 (11:46 -0700)
commitee1c7bd33e66376067fd6306b730789ee2ae53e4
tree5e41e3644225ad523dbdaf0b94cb4685be8f8d0btree | snapshot
parent60a8db790255a6bebcdc41d97e8084a440398206commit | diff
parent2d6c25215ab26bb009de3575faab7b685f138e92commit | 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
John Crispins staging tree