Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'

[cascardo/linux.git] / Documentation / vm / numa_memory_policy.txt

diff --git a/Documentation/vm/numa_memory_policy.txt b/Documentation/vm/numa_memory_policy.txt
index badb050..622b927 100644 (file)
--- a/Documentation/vm/numa_memory_policy.txt
+++ b/Documentation/vm/numa_memory_policy.txt
@@ -9,7 +9,7 @@ document attempts to describe the concepts and APIs of the 2.6 memory policy
 support.
 
 Memory policies should not be confused with cpusets
 support.
 
 Memory policies should not be confused with cpusets

-(Documentation/cgroups/cpusets.txt)
+(Documentation/cgroup-v1/cpusets.txt)

 which is an administrative mechanism for restricting the nodes from which
 memory may be allocated by a set of processes. Memory policies are a
 programming interface that a NUMA-aware application can take advantage of.  When
 which is an administrative mechanism for restricting the nodes from which
 memory may be allocated by a set of processes. Memory policies are a
 programming interface that a NUMA-aware application can take advantage of.  When