From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Sep 2017 18:34:28 +0000 (-0700)
Subject: Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: MMI-PSA29.97-13-9~4652
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1436ab068d6b0309a73849dc239399399621decd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'next-tpm' of git://git./linux/kernel/git/jmorris/linux-security

Pull TPM updates from James Morris:
 "Here are the TPM updates from Jarkko for v4.14, which I've placed in
  their own branch (next-tpm). I ended up cherry-picking them as other
  changes had been made in Jarkko's branch after he sent me his original
  pull request.

  I plan on maintaining a separate branch for TPM (and other security
  subsystems) from now on.

  From Jarkko: 'Not much this time except a few fixes'"

* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: ibmvtpm: simplify crq initialization and document crq format
  tpm: replace msleep() with  usleep_range() in TPM 1.2/2.0 generic drivers
  Documentation: tpm: add powered-while-suspended binding documentation
  tpm: tpm_crb: constify acpi_device_id.
  tpm: vtpm: constify vio_device_id
---

1436ab068d6b0309a73849dc239399399621decd