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

diff --cc Documentation/cgroups/resource_counter.txt
index caa6d662b2301fe4b9db084e1c3a3489ac7c63cf,52e1da16a3094218f6e5d36d6bd2a0a16551810e..5108afb3645c49d948cd97e7c827b2d5599e499e
--- 1/Documentation/cgroups/resource_counter.txt
--- 2/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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/core/netprio_cgroup.c
Simple merge