diff --git a/[refs] b/[refs]
index e43dc70ac8eb..aac344a09694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 838e7a03a31b890ee82c74039b84c05fa237bd46
+refs/heads/master: 6d8e74ed377dd4cbad7ccc69300f734090e15c05
diff --git a/trunk/net/phonet/Kconfig b/trunk/net/phonet/Kconfig
index 901956ada9c8..a4fceb8fbcc2 100644
--- a/trunk/net/phonet/Kconfig
+++ b/trunk/net/phonet/Kconfig
@@ -24,4 +24,5 @@ config PHONET_PIPECTRLR
 	  data with Nokia Slim modems like WG2.5 used on ST-Ericsson U8500
 	  platform.
 
-	  If unsure, say N.
+	  This option is incompatible with older Nokia modems.
+	  Say N here unless you really know what you are doing.