diff --git a/[refs] b/[refs]
index 81c67873d37a..05a4ac86f2f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3972b7f67bf1a352a4a4c350b2245d759a41ea06
+refs/heads/master: 6309ed7cb2b0671b0db9386abc6307ec3108bbaa
diff --git a/trunk/Documentation/tty.txt b/trunk/Documentation/tty.txt
index 5f799e612e03..048a8762cfb5 100644
--- a/trunk/Documentation/tty.txt
+++ b/trunk/Documentation/tty.txt
@@ -108,7 +108,9 @@ hardware driver through the function pointers within the tty->driver
 structure:
 
 write()			Write a block of characters to the tty device.
-			Returns the number of characters accepted.
+			Returns the number of characters accepted. The
+			character buffer passed to this method is already
+			in kernel space.
 
 put_char()		Queues a character for writing to the tty device.
 			If there is no room in the queue, the character is