diff options
| author | Linus Torvalds | 2019-09-16 13:34:04 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-09-16 13:34:04 -0700 |
| commit | a7bd4bcf138e7ec95c00d55fee158f6be378029b (patch) | |
| tree | e7fabdb4357243ebe96e757a3ea9a0532bc66b36 /MAINTAINERS | |
| parent | c17112a5c413f20188da276c138484e7127cdc84 (diff) | |
| parent | e8bd417aab0c72bfb54465596b16085702ba0405 (diff) | |
Merge tag 'tpmdd-next-20190902' of git://git.infradead.org/users/jjs/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"A new driver for fTPM living inside ARM TEE was added this round.
In addition to that, there are three bug fixes and one clean up"
* tag 'tpmdd-next-20190902' of git://git.infradead.org/users/jjs/linux-tpmdd:
tpm/tpm_ftpm_tee: Document fTPM TEE driver
tpm/tpm_ftpm_tee: A driver for firmware TPM running inside TEE
tpm: Remove a deprecated comments about implicit sysfs locking
tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts
tpm_tis_core: Turn on the TPM before probing IRQ's
MAINTAINERS: fix style in KEYS-TRUSTED entry
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a50e97a63bc8..b03a3893a046 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8933,7 +8933,7 @@ F: security/keys/encrypted-keys/ KEYS-TRUSTED M: James Bottomley <jejb@linux.ibm.com> -M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> +M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> M: Mimi Zohar <zohar@linux.ibm.com> L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org |