From 12f69184729c1bb3ae181c6ae55fed3e5e5b67bc Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 25 Nov 2010 09:44:07 +1100
Subject: [PATCH] --- yaml --- r: 228411 b: refs/heads/master c:
 c6c0ac664c86ff6408fadbed4913938c8a732e26 h: refs/heads/master i:   228409:
 1851ef53f1dec55d3e5cbe569730881574bcb147   228407:
 100731f24824c06ead74c4b2d06d24b2f8a6ec0d v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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)
 {