From d10413cc229a2d5ffada1244bf544c4aa8bc32fd Mon Sep 17 00:00:00 2001
From: Jeff Liu <jeff.liu@oracle.com>
Date: Wed, 21 Mar 2012 16:34:27 -0700
Subject: [PATCH] --- yaml --- r: 292693 b: refs/heads/master c:
 a488428871265979bcf2c46298a04c1d5826e6cb h: refs/heads/master i:   292691:
 35a581b3bf52f17be686c0e15bdf254696442c41 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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;
 }