diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:58:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:58:52 -0800 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /arch/m32r | |
| parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
| parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
| download | linux-f5bb3a5e9dcdb8435471562b6cada89525cf4df1.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits) Jesper Juhl is the new trivial patches maintainer Documentation: mention email-clients.txt in SubmittingPatches fs/binfmt_elf.c: spello fix do_invalidatepage() comment typo fix Documentation/filesystems/porting fixes typo fixes in net/core/net_namespace.c typo fix in net/rfkill/rfkill.c typo fixes in net/sctp/sm_statefuns.c lib/: Spelling fixes kernel/: Spelling fixes include/scsi/: Spelling fixes include/linux/: Spelling fixes include/asm-m68knommu/: Spelling fixes include/asm-frv/: Spelling fixes fs/: Spelling fixes drivers/watchdog/: Spelling fixes drivers/video/: Spelling fixes drivers/ssb/: Spelling fixes drivers/serial/: Spelling fixes drivers/scsi/: Spelling fixes ...
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/Kconfig | 3 | ||||
| -rw-r--r-- | arch/m32r/kernel/ptrace.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 12259759a2fe..795180b8fd8e 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -303,8 +303,7 @@ config SMP Y to "Enhanced Real Time Clock Support", below. The "Advanced Power Management" code will be disabled if you say Y here. - See also the <file:Documentation/smp.txt>, - and the SMP-HOWTO available at + See also the SMP-HOWTO available at <http://www.linuxdoc.org/docs.html#howto>. If you don't know what to do here, say N. diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c index ed4d0756c5db..9aa615d3a5b2 100644 --- a/arch/m32r/kernel/ptrace.c +++ b/arch/m32r/kernel/ptrace.c @@ -476,7 +476,7 @@ unregister_debug_trap(struct task_struct *child, unsigned long addr, return 0; } - /* Recover orignal instruction code. */ + /* Recover original instruction code. */ *code = p->insn[i]; /* Shift debug trap entries. */ |