diff --git a/[refs] b/[refs]
index 292424b79bc6..bf3ab6965e95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fe9b6fef11771461e69ecd1bc8935a1c7c90cb5
+refs/heads/master: 24b1442d01ae155ea716dfb94ed21605541c317d
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 9630fbdf4e6c..9b9d3bd54e3a 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -673,7 +673,7 @@ static struct kobject *get_device_parent(struct device *dev,
 		 */
 		if (parent == NULL)
 			parent_kobj = virtual_device_parent(dev);
-		else if (parent->class)
+		else if (parent->class && !dev->class->ns_type)
 			return &parent->kobj;
 		else
 			parent_kobj = &parent->kobj;