diff --git a/[refs] b/[refs]
index 4f11b812f2e8..c4c819f01b92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f3e385b7a639c633d7a4b1e863c2d52b918258
+refs/heads/master: a488428871265979bcf2c46298a04c1d5826e6cb
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 4dc9709eff31..61102938f119 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -3902,7 +3902,6 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft)
 		break;
 	default:
 		BUG();
-		break;
 	}
 	return val;
 }