diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 18:58:57 +0300 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 18:58:57 +0300 |
| commit | a52079dad4718fa924ae81a939f8a665366f562b (patch) | |
| tree | a9d6004f9bf1beff49cbfe0d5bf6edbf621b065d /Documentation/ABI/stable | |
| parent | 24c8d0804be00da90af9efa8eb404bd7a3284ba9 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | linux-a52079dad4718fa924ae81a939f8a665366f562b.tar.xz | |
Orangefs: Merge tag 'v4.4-rc1' into for-next
Linux 4.4-rc1
Diffstat (limited to 'Documentation/ABI/stable')
| -rw-r--r-- | Documentation/ABI/stable/sysfs-class-tpm | 4 | ||||
| -rw-r--r-- | Documentation/ABI/stable/sysfs-firmware-opal-elog | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/ABI/stable/sysfs-class-tpm b/Documentation/ABI/stable/sysfs-class-tpm index 9f790eebb5d2..c0e23830f56a 100644 --- a/Documentation/ABI/stable/sysfs-class-tpm +++ b/Documentation/ABI/stable/sysfs-class-tpm @@ -116,7 +116,7 @@ Description: The "pubek" property will return the TPM's public endorsement owner's authorization. Since the TPM driver doesn't store any secrets, it can't authorize its own request for the pubek, making it unaccessible. The public endorsement key is gener- - ated at TPM menufacture time and exists for the life of the + ated at TPM manufacture time and exists for the life of the chip. Example output: @@ -163,7 +163,7 @@ Date: April 2006 KernelVersion: 2.6.17 Contact: tpmdd-devel@lists.sf.net Description: The "temp_deactivated" property returns a '1' if the chip has - been temporarily dectivated, usually until the next power + been temporarily deactivated, usually until the next power cycle. Whether a warm boot (reboot) will clear a TPM chip from a temp_deactivated state is platform specific. diff --git a/Documentation/ABI/stable/sysfs-firmware-opal-elog b/Documentation/ABI/stable/sysfs-firmware-opal-elog index e1f3058f5954..2536434d49d0 100644 --- a/Documentation/ABI/stable/sysfs-firmware-opal-elog +++ b/Documentation/ABI/stable/sysfs-firmware-opal-elog @@ -57,4 +57,4 @@ Description: Shortly after acknowledging it, the log entry will be removed from sysfs. Reading this file will list the supported - operations (curently just acknowledge).
\ No newline at end of file + operations (currently just acknowledge). |