Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[linux-2.6-block.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8a79a6f0f029842860fae7cd9b15c8c90600d56c..c8569bc298ffc77c5a2627b5a4d2fd2a42b91742 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1438,7 +1438,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)
 {