Merge tag 'nfs-for-3.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / Documentation / rfkill.txt

diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt
index 427e89712f4a27c25117ce5bfe85d1ff7078300d..2ee6ef9a6554d600088ae572b3256ffe44e51d08 100644 (file)
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
@@ -25,6 +25,9 @@ whether they can be changed or not:
  - soft block: writable radio block (need not be readable) that is set by
                the system software.
 
+The rfkill subsystem has two parameters, rfkill.default_state and
+rfkill.master_switch_mode, which are documented in kernel-parameters.txt.
+
 
 2. Implementation details