Merge branch 'master' into next

1 files changed, 9 insertions, 5 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8cc40a1bee06..224263e7711f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -115,7 +115,7 @@ In addition, the following text indicates that the option:
 Parameters denoted with BOOT are actually interpreted by the boot
 loader, and have no meaning to the kernel directly.
 Do not modify the syntax of boot loader parameters without extreme
-need or coordination with <Documentation/x86/i386/boot.txt>.
+need or coordination with <Documentation/x86/boot.txt>.
 
 There are also arch-specific kernel-parameters not documented here.
 See for example <Documentation/x86/x86_64/boot-options.txt>.
@@ -135,7 +135,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         acpi=           [HW,ACPI,X86-64,i386]
                         Advanced Configuration and Power Interface
-                        Format: { force | off | ht | strict | noirq }
+                        Format: { force | off | ht | strict | noirq | rsdt }
                         force -- enable ACPI if default was off
                         off -- disable ACPI if default was on
                         noirq -- do not use ACPI for IRQ routing
@@ -869,8 +869,10 @@ and is between 256 and 4096 characters. It is defined in the file
         icn=            [HW,ISDN]
                         Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
 
-        ide=            [HW] (E)IDE subsystem
-                        Format: ide=nodma or ide=doubler
+        ide-core.nodma= [HW] (E)IDE subsystem
+                        Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc
+                        .vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom
+                        .chs .ignore_cable are additional options
                         See Documentation/ide/ide.txt.
 
         idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
@@ -947,6 +949,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
 
         intel_iommu=    [DMAR] Intel IOMMU driver (DMAR) option
+                on
+                        Enable intel iommu driver.
                 off
                         Disable intel iommu driver.
                 igfx_off [Default Off]
@@ -2457,7 +2461,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         See Documentation/fb/modedb.txt.
 
         vga=            [BOOT,X86-32] Select a particular video mode
-                        See Documentation/x86/i386/boot.txt and
+                        See Documentation/x86/boot.txt and
                         Documentation/svga.txt.
                         Use vga=ask for menu.
                         This is actually a boot loader parameter; the value is