Merge branch 'linus' into perf/core

Refresh the branch to a v3.14-rc base before queueing up new devel patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index e7ba650086ce..926afb6f6b5f 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -64,7 +64,7 @@ struct kobject {
         struct kobject          *parent;
         struct kset             *kset;
         struct kobj_type        *ktype;
-        struct sysfs_dirent     *sd;
+        struct kernfs_node      *sd;
         struct kref             kref;
 #ifdef CONFIG_DEBUG_KOBJECT_RELEASE
         struct delayed_work     release;