diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/powerpc/phyp-assisted-dump.txt | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'Documentation/powerpc/phyp-assisted-dump.txt')
| -rw-r--r-- | Documentation/powerpc/phyp-assisted-dump.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/powerpc/phyp-assisted-dump.txt b/Documentation/powerpc/phyp-assisted-dump.txt index c4682b982a2e..ad340205d96a 100644 --- a/Documentation/powerpc/phyp-assisted-dump.txt +++ b/Documentation/powerpc/phyp-assisted-dump.txt | |||
| @@ -19,7 +19,7 @@ dump offers several strong, practical advantages: | |||
| 19 | immediately available to the system for normal use. | 19 | immediately available to the system for normal use. |
| 20 | -- After the dump is completed, no further reboots are | 20 | -- After the dump is completed, no further reboots are |
| 21 | required; the system will be fully usable, and running | 21 | required; the system will be fully usable, and running |
| 22 | in it's normal, production mode on it normal kernel. | 22 | in its normal, production mode on its normal kernel. |
| 23 | 23 | ||
| 24 | The above can only be accomplished by coordination with, | 24 | The above can only be accomplished by coordination with, |
| 25 | and assistance from the hypervisor. The procedure is | 25 | and assistance from the hypervisor. The procedure is |