projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6551d5c dc10e41)
Merge tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2020 22:54:30 +0000 (14:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2020 22:54:30 +0000 (14:54 -0800)
Pull tpm fixes from Jarkko Sakkinen:
 "Two bug fixes"

* tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd:
  tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST
  tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git