diff --git a/[refs] b/[refs]
index 447e8dbeb531..dfe44d81601f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67fc233f4fb67907861b4077cea5294035f80dc7
+refs/heads/master: 178a5b35b2777346206d4b577b36d10061732f8c
diff --git a/trunk/Documentation/kobject.txt b/trunk/Documentation/kobject.txt
index 668cb83d9561..3ab2472509cb 100644
--- a/trunk/Documentation/kobject.txt
+++ b/trunk/Documentation/kobject.txt
@@ -406,4 +406,5 @@ called, and the objects in the former circle release each other.
 Example code to copy from
 
 For a more complete example of using ksets and kobjects properly, see the
-sample/kobject/kset-example.c code.
+example programs samples/kobject/{kobject-example.c,kset-example.c},
+which will be built as loadable modules if you select CONFIG_SAMPLE_KOBJECT.