Merge branch 'connlimit' of git://dev.medozas.de/linux

[pandora-kernel.git] / Documentation / cgroups / memcg_test.txt

diff --git a/Documentation/cgroups/memcg_test.txt b/Documentation/cgroups/memcg_test.txt
index b7eecec..fc8fa97 100644 (file)
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
@@ -398,7 +398,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
        written to move_charge_at_immigrate.
 
  9.10 Memory thresholds
-       Memory controler implements memory thresholds using cgroups notification
+       Memory controller implements memory thresholds using cgroups notification
        API. You can use Documentation/cgroups/cgroup_event_listener.c to test
        it.