diff --git a/[refs] b/[refs]
index 0793236cf3d7..b3500b42ecf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ec2c68c11af95075f29e370970eb97c89234e2e
+refs/heads/master: f71fea23a27ba8ec53375832aab6a80fc14622e0
diff --git a/trunk/Documentation/rfkill.txt b/trunk/Documentation/rfkill.txt
index de941e309d47..1b74b5f30af4 100644
--- a/trunk/Documentation/rfkill.txt
+++ b/trunk/Documentation/rfkill.txt
@@ -113,7 +113,7 @@ The following sysfs entries exist for every rfkill device:
 		0: RFKILL_STATE_SOFT_BLOCKED
 			transmitter is turned off by software
 		1: RFKILL_STATE_UNBLOCKED
-			transmiter is (potentially) active
+			transmitter is (potentially) active
 		2: RFKILL_STATE_HARD_BLOCKED
 			transmitter is forced off by something outside of
 			the driver's control.
@@ -128,3 +128,9 @@ RFKILL_TYPE
 
 The contents of these variables corresponds to the "name", "state" and
 "type" sysfs files explained above.
+
+An alternative userspace interface exists as a misc device /dev/rfkill,
+which allows userspace to obtain and set the state of rfkill devices and
+sets of devices. It also notifies userspace about device addition and
+removal. The API is a simple read/write API that is defined in
+linux/rfkill.h.