From 40920c60d8f98b10fe4e56a33da992db2ca76d42 Mon Sep 17 00:00:00 2001
From: Greg Thelen <gthelen@google.com>
Date: Mon, 15 Mar 2010 15:27:28 +0100
Subject: [PATCH] --- yaml --- r: 192538 b: refs/heads/master c:
 320cc51d90832231cece478f0db6550ef367f8f3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9af70cff3e4f..77db1dc1b129 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32e688b8c1afafa389223a4813b97e8c128a1636
+refs/heads/master: 320cc51d90832231cece478f0db6550ef367f8f3
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 7973b5221fb8..6e8533e2861b 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -1435,7 +1435,7 @@ static void drain_local_stock(struct work_struct *dummy)
 
 /*
  * Cache charges(val) which is from res_counter, to local per_cpu area.
- * This will be consumed by consumt_stock() function, later.
+ * This will be consumed by consume_stock() function, later.
  */
 static void refill_stock(struct mem_cgroup *mem, int val)
 {