Merge tag 'md/3.20' of git://neil.brown.name/md

[cascardo/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f06f1f6..a89e326 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1497,6 +1497,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                forcesac
                soft
                pt              [x86, IA-64]
+               nobypass        [PPC/POWERNV]
+                       Disable IOMMU bypass, using IOMMU for PCI devices.
 
 
        io7=            [HW] IO7 for Marvel based alpha systems
@@ -3210,6 +3212,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        retain_initrd   [RAM] Keep initrd memory after extraction
 
+       rfkill.default_state=
+               0       "airplane mode".  All wifi, bluetooth, wimax, gps, fm,
+                       etc. communication is blocked by default.
+               1       Unblocked.
+
+       rfkill.master_switch_mode=
+               0       The "airplane mode" button does nothing.
+               1       The "airplane mode" button toggles between everything
+                       blocked and the previous configuration.
+               2       The "airplane mode" button toggles between everything
+                       blocked and everything unblocked.
+
        rhash_entries=  [KNL,NET]
                        Set number of hash buckets for route cache