diff --git a/[refs] b/[refs] index c94ce0f1efb4..4a78e1a0b8fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6afb1c65d0e67547cef19e2d4c40f7b2d8578bff +refs/heads/master: a9ed83a581d01b8330cd1fc867fd8a770342828f diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 0f17d16dc101..c363840cdcea 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -933,7 +933,7 @@ and is between 256 and 4096 characters. It is defined in the file 1 -- enable informational integrity auditing messages. ima_hash= [IMA] - Formt: { "sha1" | "md5" } + Format: { "sha1" | "md5" } default: "sha1" ima_tcb [IMA]