Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c867f506366ddd99bfb3048e59df1d425464796d..256a2162503c1b91c450c794401c33e0af8ee5c7 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -763,11 +763,11 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
 
        ide=            [HW] (E)IDE subsystem
-                       Format: ide=nodma or ide=doubler or ide=reverse
+                       Format: ide=nodma or ide=doubler
                        See Documentation/ide/ide.txt.
 
        ide?=           [HW] (E)IDE subsystem
-                       Format: ide?=noprobe or chipset specific parameters.
+                       Format: ide?=ata66 or chipset specific parameters.
                        See Documentation/ide/ide.txt.
 
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
@@ -1362,6 +1362,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nowb            [ARM]
 
+       nptcg=          [IA64] Override max number of concurrent global TLB
+                       purges which is reported from either PAL_VM_SUMMARY or
+                       SAL PALO.
+
        numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
                        one of ['zone', 'node', 'default'] can be specified
                        This can be set from sysctl after boot.