diff --git a/[refs] b/[refs] index 623707d3ca2a..d7ce3ba0ac71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d8333c24d41637f0f847f6e17032189dae08c02 +refs/heads/master: a231934bdf086a4fefc0df06e669499125a9db6f diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h index d542faa6cb47..60f0d418ae32 100644 --- a/trunk/include/linux/kobject.h +++ b/trunk/include/linux/kobject.h @@ -58,12 +58,12 @@ enum kobject_action { struct kobject { const char *name; - struct kref kref; struct list_head entry; struct kobject *parent; struct kset *kset; struct kobj_type *ktype; struct sysfs_dirent *sd; + struct kref kref; unsigned int state_initialized:1; unsigned int state_in_sysfs:1; unsigned int state_add_uevent_sent:1;