diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/cris/kernel/traps.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/cris/kernel/traps.c')
| -rw-r--r-- | arch/cris/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c index 541efbf09371..8da53f34c7a7 100644 --- a/arch/cris/kernel/traps.c +++ b/arch/cris/kernel/traps.c | |||
| @@ -183,7 +183,7 @@ __initcall(oops_nmi_register); | |||
| 183 | 183 | ||
| 184 | /* | 184 | /* |
| 185 | * This gets called from entry.S when the watchdog has bitten. Show something | 185 | * This gets called from entry.S when the watchdog has bitten. Show something |
| 186 | * similiar to an Oops dump, and if the kernel is configured to be a nice | 186 | * similar to an Oops dump, and if the kernel is configured to be a nice |
| 187 | * doggy, then halt instead of reboot. | 187 | * doggy, then halt instead of reboot. |
| 188 | */ | 188 | */ |
| 189 | void | 189 | void |