Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / Documentation / power / 00-INDEX

diff --git a/Documentation/power/00-INDEX b/Documentation/power/00-INDEX
index 45e9d4a91284678e9a9acf55ab5a23b07d17ce33..a4d682f54231d01eafdbb23ebab39d571a409c52 100644 (file)
--- a/Documentation/power/00-INDEX
+++ b/Documentation/power/00-INDEX
@@ -26,6 +26,8 @@ s2ram.txt
        - How to get suspend to ram working (and debug it when it isn't)
 states.txt
        - System power management states
+suspend-and-cpuhotplug.txt
+       - Explains the interaction between Suspend-to-RAM (S3) and CPU hotplug
 swsusp-and-swap-files.txt
        - Using swap files with software suspend (to disk)
 swsusp-dmcrypt.txt