Merge branch 'linus' into irq/numa
[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt
index fd5cac013037defc68c3ef118ed70b476debee71..11648c13a7290e48181e6f1b97c33096a621f5f6 100644 (file)
@@ -1575,6 +1575,9 @@ and is between 256 and 4096 characters. It is defined in the file
        noinitrd        [RAM] Tells the kernel not to load any configured
                        initial RAM disk.
 
+       nointremap      [X86-64, Intel-IOMMU] Do not enable interrupt
+                       remapping.
+
        nointroute      [IA-64]
 
        nojitter        [IA64] Disables jitter checking for ITC timers.