Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0e6a129..a8ba119 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1020,10 +1020,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        has the capability. With this option, super page will
                        not be supported.
        intremap=       [X86-64, Intel-IOMMU]
-                       Format: { on (default) | off | nosid }
                        on      enable Interrupt Remapping (default)
                        off     disable Interrupt Remapping
                        nosid   disable Source ID checking
+                       no_x2apic_optout
+                               BIOS x2APIC opt-out request will be ignored
 
        inttest=        [IA-64]
 
@@ -2246,6 +2247,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        in <PAGE_SIZE> units (needed only for swap files).
                        See  Documentation/power/swsusp-and-swap-files.txt
 
+       resumedelay=    [HIBERNATION] Delay (in seconds) to pause before attempting to
+                       read the resume files
+
+       resumewait      [HIBERNATION] Wait (indefinitely) for resume device to show up.
+                       Useful for devices that are detected asynchronously
+                       (e.g. USB and MMC devices).
+
        hibernate=      [HIBERNATION]
                noresume        Don't check if there's a hibernation image
                                present during boot.