diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/ppc/Kconfig | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/ppc/Kconfig')
| -rw-r--r-- | arch/ppc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index b55de4f42aec..a04cdf01596b 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
| @@ -219,10 +219,10 @@ config KEXEC | |||
| 219 | help | 219 | help |
| 220 | kexec is a system call that implements the ability to shutdown your | 220 | kexec is a system call that implements the ability to shutdown your |
| 221 | current kernel, and to start another kernel. It is like a reboot | 221 | current kernel, and to start another kernel. It is like a reboot |
| 222 | but it is indepedent of the system firmware. And like a reboot | 222 | but it is independent of the system firmware. And like a reboot |
| 223 | you can start any kernel with it, not just Linux. | 223 | you can start any kernel with it, not just Linux. |
| 224 | 224 | ||
| 225 | The name comes from the similiarity to the exec system call. | 225 | The name comes from the similarity to the exec system call. |
| 226 | 226 | ||
| 227 | It is an ongoing process to be certain the hardware in a machine | 227 | It is an ongoing process to be certain the hardware in a machine |
| 228 | is properly shutdown, so do not be surprised if this code does not | 228 | is properly shutdown, so do not be surprised if this code does not |