Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.

[cascardo/linux.git] / Documentation / ABI / testing / sysfs-devices-memory

diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory
index 7405de2..deef3b5 100644 (file)
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
@@ -61,6 +61,14 @@ Users:               hotplug memory remove tools
                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
 
 
+What:           /sys/devices/system/memory/memoryX/valid_zones
+Date:           July 2014
+Contact:       Zhang Zhen <zhenzhang.zhang@huawei.com>
+Description:
+               The file /sys/devices/system/memory/memoryX/valid_zones is
+               read-only and is designed to show which zone this memory
+               block can be onlined to.
+
 What:          /sys/devices/system/memoryX/nodeY
 Date:          October 2009
 Contact:       Linux Memory Management list <linux-mm@kvack.org>