diff --git a/[refs] b/[refs]
index 4a367c942fb2..0cb26a6fc3f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0220d686b926a5865a2032c805015758bfdda69
+refs/heads/master: f05e21b39f7dddcebab03ff329fef5783fea58d4
diff --git a/trunk/drivers/firewire/Kconfig b/trunk/drivers/firewire/Kconfig
index 76f26710fc16..fa6d6abefd4d 100644
--- a/trunk/drivers/firewire/Kconfig
+++ b/trunk/drivers/firewire/Kconfig
@@ -16,8 +16,13 @@ config FIREWIRE
 	  enable the new stack.
 
 	  To compile this driver as a module, say M here: the module will be
-	  called firewire-core.  It functionally replaces ieee1394, raw1394,
-	  and video1394.
+	  called firewire-core.
+
+	  This module functionally replaces ieee1394, raw1394, and video1394.
+	  To access it from application programs, you generally need at least
+	  libraw1394 version 2.  IIDC/DCAM applications also need libdc1394
+	  version 2.  No libraries are required to access storage devices
+	  through the firewire-sbp2 driver.
 
 config FIREWIRE_OHCI
 	tristate "OHCI-1394 controllers"