IB/cm: Endianness annotations

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4cd1a5da80a4d4f11a17214ed8c344ccf9bd06c4..dafd001bf83339829c6409bec6e6a1ff2a73f9c1 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -375,6 +375,10 @@ and is between 256 and 4096 characters. It is defined in the file
        ccw_timeout_log [S390]
                        See Documentation/s390/CommonIO for details.
 
+       cgroup_disable= [KNL] Disable a particular controller
+                       Format: {name of the controller(s) to disable}
+                               {Currently supported controllers - "memory"}
+
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
                        See security/selinux/Kconfig help text.
@@ -840,7 +844,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        arch/alpha/kernel/core_marvel.c.
 
        ip=             [IP_PNP]
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
                        See comment before ip2_setup() in
@@ -1194,10 +1198,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        file if at all.
 
        nfsaddrs=       [NFS]
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        nfs.callback_tcpport=
                        [NFS] set the TCP port on which the NFSv4 callback