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/sh/Kconfig | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 2bcecf422573..1a0db1d4c952 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -465,10 +465,10 @@ config KEXEC | |||
| 465 | help | 465 | help |
| 466 | kexec is a system call that implements the ability to shutdown your | 466 | kexec is a system call that implements the ability to shutdown your |
| 467 | current kernel, and to start another kernel. It is like a reboot | 467 | current kernel, and to start another kernel. It is like a reboot |
| 468 | but it is indepedent of the system firmware. And like a reboot | 468 | but it is independent of the system firmware. And like a reboot |
| 469 | you can start any kernel with it, not just Linux. | 469 | you can start any kernel with it, not just Linux. |
| 470 | 470 | ||
| 471 | The name comes from the similiarity to the exec system call. | 471 | The name comes from the similarity to the exec system call. |
| 472 | 472 | ||
| 473 | It is an ongoing process to be certain the hardware in a machine | 473 | It is an ongoing process to be certain the hardware in a machine |
| 474 | is properly shutdown, so do not be surprised if this code does not | 474 | is properly shutdown, so do not be surprised if this code does not |