diff --git a/[refs] b/[refs]
index b0d73cb831f0..ab22f5d0825d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 091bd3ea4e7ff4da8509978b9be93dc9d8cf0680
+refs/heads/master: ab27b91b9f1937ddb9e0eb0d0892728f852b48cf
diff --git a/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index feb2d69396cf..907c2b3af758 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/fs/sysfs/inode.c
@@ -62,8 +62,8 @@ static struct sysfs_inode_attrs *sysfs_init_inode_attrs(struct sysfs_dirent *sd)
 
 	/* assign default attributes */
 	iattrs->ia_mode = sd->s_mode;
-	iattrs->ia_uid = 0;
-	iattrs->ia_gid = 0;
+	iattrs->ia_uid = GLOBAL_ROOT_UID;
+	iattrs->ia_gid = GLOBAL_ROOT_GID;
 	iattrs->ia_atime = iattrs->ia_mtime = iattrs->ia_ctime = CURRENT_TIME;
 
 	return attrs;
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index be587651b952..908e61cd0b0e 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -952,7 +952,6 @@ config UIDGID_CONVERTED
 	depends on QNX6FS_FS = n
 	depends on REISERFS_FS = n
 	depends on SQUASHFS = n
-	depends on SYSFS = n
 	depends on SYSV_FS = n
 	depends on TMPFS = n
 	depends on UBIFS_FS = n