diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /arch/sparc64 | |
| parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
| parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
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/sparc64')
| -rw-r--r-- | arch/sparc64/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index a7739b507b74..a8c6366f05a1 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -168,9 +168,8 @@ config SMP | |||
| 168 | Y to "Enhanced Real Time Clock Support", below. The "Advanced Power | 168 | Y to "Enhanced Real Time Clock Support", below. The "Advanced Power |
| 169 | Management" code will be disabled if you say Y here. | 169 | Management" code will be disabled if you say Y here. |
| 170 | 170 | ||
| 171 | See also the <file:Documentation/smp.txt>, | 171 | See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO |
| 172 | <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at | 172 | available at <http://www.tldp.org/docs.html#howto>. |
| 173 | <http://www.tldp.org/docs.html#howto>. | ||
| 174 | 173 | ||
| 175 | If you don't know what to do here, say N. | 174 | If you don't know what to do here, say N. |
| 176 | 175 | ||