diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /arch/x86_64/kernel/crash.c | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'arch/x86_64/kernel/crash.c')
-rw-r--r-- | arch/x86_64/kernel/crash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c index 8ca04912b1cc..d8d5750d6106 100644 --- a/arch/x86_64/kernel/crash.c +++ b/arch/x86_64/kernel/crash.c | |||
@@ -161,7 +161,7 @@ void machine_crash_shutdown(struct pt_regs *regs) | |||
161 | { | 161 | { |
162 | /* | 162 | /* |
163 | * This function is only called after the system | 163 | * This function is only called after the system |
164 | * has paniced or is otherwise in a critical state. | 164 | * has panicked or is otherwise in a critical state. |
165 | * The minimum amount of code to allow a kexec'd kernel | 165 | * The minimum amount of code to allow a kexec'd kernel |
166 | * to run successfully needs to happen here. | 166 | * to run successfully needs to happen here. |
167 | * | 167 | * |