From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2019 20:34:04 +0000 (-0700)
Subject: Merge tag 'tpmdd-next-20190902' of git://git.infradead.org/users/jjs/linux-tpmdd
X-Git-Tag: microblaze-v5.5-rc1~231
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a7bd4bcf138e7ec95c00d55fee158f6be378029b;p=linux-2.6-microblaze.git

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
---

a7bd4bcf138e7ec95c00d55fee158f6be378029b