diff options
| author | Len Brown <len.brown@intel.com> | 2008-03-13 01:59:53 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-03-13 01:59:53 -0400 |
| commit | 29ea5171cbd08a7ef37e543cbf02447033f0e289 (patch) | |
| tree | 80d6c7f8e002117283dd1c1db4d3a915833652c7 /arch | |
| parent | b4de123a0bc4a3f0c90899864d51299628729952 (diff) | |
| parent | 53471121a8aad3f0b590bfce7c95a1f5f52150f3 (diff) | |
Merge branches 'release' and 'doc' into release
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 237fc128143d..6c70fed0f9a0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1259,7 +1259,7 @@ menuconfig APM | |||
| 1259 | machines with more than one CPU. | 1259 | machines with more than one CPU. |
| 1260 | 1260 | ||
| 1261 | In order to use APM, you will need supporting software. For location | 1261 | In order to use APM, you will need supporting software. For location |
| 1262 | and more information, read <file:Documentation/pm.txt> and the | 1262 | and more information, read <file:Documentation/power/pm.txt> and the |
| 1263 | Battery Powered Linux mini-HOWTO, available from | 1263 | Battery Powered Linux mini-HOWTO, available from |
| 1264 | <http://www.tldp.org/docs.html#howto>. | 1264 | <http://www.tldp.org/docs.html#howto>. |
| 1265 | 1265 | ||