From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 05:27:34 +0000 (+1100)
Subject: Merge remote-tracking branch 'cgroup/for-next'
X-Git-Tag: next-20140106~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e815b78f5c4abb9bdb4e92309520ed68ca54800;p=karo-tx-linux.git

Merge remote-tracking branch 'cgroup/for-next'
---

8e815b78f5c4abb9bdb4e92309520ed68ca54800
diff --cc Documentation/cgroups/resource_counter.txt
index caa6d662b230,52e1da16a309..5108afb3645c
--- a/Documentation/cgroups/resource_counter.txt
+++ b/Documentation/cgroups/resource_counter.txt
@@@ -95,10 -95,10 +95,10 @@@ to work with it
  
   f. u64 res_counter_uncharge_until
  		(struct res_counter *rc, struct res_counter *top,
 -		 unsinged long val)
 +		 unsigned long val)
  
- 	Almost same as res_cunter_uncharge() but propagation of uncharge
- 	stops when rc == top. This is useful when kill a res_coutner in
+ 	Almost same as res_counter_uncharge() but propagation of uncharge
+ 	stops when rc == top. This is useful when kill a res_counter in
  	child cgroup.
  
   2.1 Other accounting routines