diff --git a/[refs] b/[refs]
index 48aabf7eb44b..da870e22d6cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68db38f1537a44097e264f28bda751d6b919cd53
+refs/heads/master: bc231d2a048010d5e0b49ac7fddbfa822fc41109
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 2aa408201aa5..d8abe996e009 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -919,7 +919,6 @@ static int cgroup_get_rootdir(struct super_block *sb)
 	if (!inode)
 		return -ENOMEM;
 
-	inode->i_op = &simple_dir_inode_operations;
 	inode->i_fop = &simple_dir_operations;
 	inode->i_op = &cgroup_dir_inode_operations;
 	/* directories start off with i_nlink == 2 (for "." entry) */