Merge tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0d79a88f4de93e642b386215c21aef2111699d77..7c33ef8a1ba952ade64bd3209f0669a80b2ab301 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -713,6 +713,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        The filter can be disabled or changed to another
                        driver later using sysfs.
 
+       drm_kms_helper.edid_firmware=[<connector>:]<file>
+                       Broken monitors, graphic adapters and KVMs may
+                       send no or incorrect EDID data sets. This parameter
+                       allows to specify an EDID data set in the
+                       /lib/firmware directory that is used instead.
+                       Generic built-in EDID data sets are used, if one of
+                       edid/1024x768.bin, edid/1280x1024.bin,
+                       edid/1680x1050.bin, or edid/1920x1080.bin is given
+                       and no file with the same name exists. Details and
+                       instructions how to build your own EDID data are
+                       available in Documentation/EDID/HOWTO.txt. An EDID
+                       data set will only be used for a particular connector,
+                       if its name and a colon are prepended to the EDID
+                       name.
+
        dscc4.setup=    [NET]
 
        earlycon=       [KNL] Output early console device and options.
@@ -950,7 +965,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                             controller
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
                             controllers
-       i8042.notimeout [HW] Ignore timeout condition signalled by conroller
+       i8042.notimeout [HW] Ignore timeout condition signalled by controller
        i8042.reset     [HW] Reset the controller during init and cleanup
        i8042.unlock    [HW] Unlock (ignore) the keylock
 
@@ -2234,6 +2249,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
                        default: off.
 
+       printk.always_kmsg_dump=
+                       Trigger kmsg_dump for cases other than kernel oops or
+                       panics
+                       Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
+                       default: disabled
+
        printk.time=    Show timing data prefixed to each printk message line
                        Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
 
@@ -2457,7 +2478,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        For more information see Documentation/vm/slub.txt.
 
        slub_min_order= [MM, SLUB]
-                       Determines the mininum page order for slabs. Must be
+                       Determines the minimum page order for slabs. Must be
                        lower than slub_max_order.
                        For more information see Documentation/vm/slub.txt.
 
@@ -2623,7 +2644,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        threadirqs      [KNL]
                        Force threading of all interrupt handlers except those
-                       marked explicitely IRQF_NO_THREAD.
+                       marked explicitly IRQF_NO_THREAD.
 
        topology=       [S390]
                        Format: {off | on}
@@ -2652,6 +2673,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        to facilitate early boot debugging.
                        See also Documentation/trace/events.txt
 
+       transparent_hugepage=
+                       [KNL]
+                       Format: [always|madvise|never]
+                       Can be used to control the default behavior of the system
+                       with respect to transparent hugepages.
+                       See Documentation/vm/transhuge.txt for more details.
+
        tsc=            Disable clocksource stability checks for TSC.
                        Format: <string>
                        [x86] reliable: mark tsc clocksource as reliable, this