diff --git a/[refs] b/[refs]
index 6ca529ca9d91..13567c9a8ce8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e030d58e8860f1c87b17631dbdd70747cbe1fb5b
+refs/heads/master: c6c0ac664c86ff6408fadbed4913938c8a732e26
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 46ff6c251932..610d967632cd 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -1513,6 +1513,8 @@ EXPORT_SYMBOL_GPL(device_destroy);
  * exclusion between two different calls of device_rename
  * on the same device to ensure that new_name is valid and
  * won't conflict with other devices.
+ *
+ * "Never use this function, bad things will happen" - gregkh
  */
 int device_rename(struct device *dev, const char *new_name)
 {