diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /Documentation/sysctl/kernel.txt | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'Documentation/sysctl/kernel.txt')
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index b0c7ab93dcb9..7345c338080a 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
| @@ -211,9 +211,8 @@ Controls the kernel's behaviour when an oops or BUG is encountered. | |||
| 211 | 211 | ||
| 212 | 0: try to continue operation | 212 | 0: try to continue operation |
| 213 | 213 | ||
| 214 | 1: delay a few seconds (to give klogd time to record the oops output) and | 214 | 1: panic immediatly. If the `panic' sysctl is also non-zero then the |
| 215 | then panic. If the `panic' sysctl is also non-zero then the machine will | 215 | machine will be rebooted. |
| 216 | be rebooted. | ||
| 217 | 216 | ||
| 218 | ============================================================== | 217 | ============================================================== |
| 219 | 218 | ||