The following commit has been merged in the linux branch: commit 468727ab1273a0f95562befa611a3ce39778599c Author: Alex Chiang achiang@hp.com Date: Wed Oct 21 21:45:15 2009 -0600

Documentation: ABI: rename sysfs-devices-cache_disable properly

Rename sysfs-devices-cache_disable to sysfs-devices-system-cpu, in order to keep a stricter correlation between a sysfs directory and its documentation.

Reported-by: David Rientjes rientjes@google.com Signed-off-by: Alex Chiang achiang@hp.com Acked-by: David Rientjes rientjes@google.com Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/Documentation/ABI/testing/sysfs-devices-cache_disable b/Documentation/ABI/testing/sysfs-devices-system-cpu similarity index 100% rename from Documentation/ABI/testing/sysfs-devices-cache_disable rename to Documentation/ABI/testing/sysfs-devices-system-cpu