summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-12-20 15:05:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 17:40:19 -0800
commit038b358e5592eff9be175cf6601042ecc8b28179 (patch)
tree2a8cf1b3dfbb409204274382e560ca25ce5ed149 /Documentation
parentc8b74c2f6604923de91f8aa6539f8bb934736754 (diff)
downloadlinux-038b358e5592eff9be175cf6601042ecc8b28179.tar.bz2
Documentation: kernel-parameters.txt remove capability.disable
Remove the documentation for capability.disable. The code supporting this parameter was removed with commit 5915eb53861c ("security: remove dummy module") Signed-off-by: Josh Boyer <jwboyer@redhat.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Cc: Rob Landley <rob@landley.net> Cc: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ddd84d627185..363e348bff9b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -446,12 +446,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
possible to determine what the correct size should be.
This option provides an override for these situations.
- capability.disable=
- [SECURITY] Disable capabilities. This would normally
- be used only if an alternative security model is to be
- configured. Potentially dangerous and should only be
- used if you are entirely sure of the consequences.
-
ccw_timeout_log [S390]
See Documentation/s390/CommonIO for details.