diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-01 05:11:07 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-01 05:11:07 -0500 |
| commit | e87a3dd33eab30b4db539500064a9584867e4f2c (patch) | |
| tree | 2f7ad16e46ae30518ff63bb5391b63f7f7cc74dd /Documentation/kernel-parameters.txt | |
| parent | b14f5de731ae657d498d18d713c6431bfbeefb4b (diff) | |
| parent | 3d00941371a765779c4e3509214c7e5793cce1fe (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0f17d16dc101..6fa7292947e5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -671,7 +671,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 671 | earlyprintk= [X86,SH,BLACKFIN] | 671 | earlyprintk= [X86,SH,BLACKFIN] |
| 672 | earlyprintk=vga | 672 | earlyprintk=vga |
| 673 | earlyprintk=serial[,ttySn[,baudrate]] | 673 | earlyprintk=serial[,ttySn[,baudrate]] |
| 674 | earlyprintk=dbgp | 674 | earlyprintk=dbgp[debugController#] |
| 675 | 675 | ||
| 676 | Append ",keep" to not disable it when the real console | 676 | Append ",keep" to not disable it when the real console |
| 677 | takes over. | 677 | takes over. |
| @@ -933,7 +933,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 933 | 1 -- enable informational integrity auditing messages. | 933 | 1 -- enable informational integrity auditing messages. |
| 934 | 934 | ||
| 935 | ima_hash= [IMA] | 935 | ima_hash= [IMA] |
| 936 | Formt: { "sha1" | "md5" } | 936 | Format: { "sha1" | "md5" } |
| 937 | default: "sha1" | 937 | default: "sha1" |
| 938 | 938 | ||
| 939 | ima_tcb [IMA] | 939 | ima_tcb [IMA] |