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
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d38ebd3b1201..ec78a5762e9e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1755,8 +1755,8 @@ config SMP
           People using multiprocessor machines who say Y here should also say
           Y to "Enhanced Real Time Clock Support", below.
 
-          See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-          available at <http://www.tldp.org/docs.html#howto>.
+          See also the SMP-HOWTO available at
+          <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.