diff --git a/[refs] b/[refs]
index 3a72f050c16c..c5a7e3f53f5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 804b3c28a4e4fa1c224571bf76edb534b9c4b1ed
+refs/heads/master: 839ec5452ebfd5905b9c69b20ceb640903a8ea1a
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 492215d67fa5..5a54ff42874e 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -1115,8 +1115,10 @@ static void cgroup_kill_sb(struct super_block *sb) {
 	}
 	write_unlock(&css_set_lock);
 
-	list_del(&root->root_list);
-	root_count--;
+	if (!list_empty(&root->root_list)) {
+		list_del(&root->root_list);
+		root_count--;
+	}
 
 	mutex_unlock(&cgroup_mutex);