diff options
author | Jonathan Corbet <corbet@lwn.net> | 2016-10-25 18:05:23 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2016-10-25 18:05:23 -0600 |
commit | 9e1f08607f904e89568e197f4e30985484a87fd7 (patch) | |
tree | eb1e5388ce1d7f65302597c495f5b45b8b3d700e /include/linux/pm.h | |
parent | bb118c56fda53fbca71ee8f35ff870d35370c969 (diff) | |
parent | 3cbd4b543bef00c638fd63f6f043006c0c432f23 (diff) | |
download | linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.tar.gz linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.tar.bz2 linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.zip |
Merge branch 'mauro-books' into docs-next
Merge Mauro's massive patch series creating the process and admin-guide
books. I think there's a lot of stuff to clean up here, but there's no
point in holding things up for that.
Mauro sez:
This patch series continues the efforts of converting the Linux Kernel
documentation to Sphinx.
It contains text to ReST conversion of several files under Documentation,
and a few ones under the main dir (README, REPORTING-BUGS).
All patches on this series can be found on my development tree:
https://git.linuxtv.org/mchehab/experimental.git/log/?h=lkml-books-v2
The Kernel docs html output after this series can be seen at:
https://mchehab.fedorapeople.org/kernel_docs/
Diffstat (limited to 'include/linux/pm.h')
-rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 06eb353182ab..efa67b2dfee9 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -258,7 +258,7 @@ typedef struct pm_message { * example, if it detects that a child was unplugged while the system was * asleep). * - * Refer to Documentation/power/devices.txt for more information about the role + * Refer to Documentation/power/admin-guide/devices.rst for more information about the role * of the above callbacks in the system suspend process. * * There also are callbacks related to runtime power management of devices. |