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

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 68380cb2ff88..bf0468cbe713 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -79,7 +79,7 @@ config FRV_OUTOFLINE_ATOMIC_OPS
           Setting this option causes the FR-V atomic operations to be mostly
           implemented out-of-line.
 
-          See Documentation/fujitsu/frv/atomic-ops.txt for more information.
+          See Documentation/frv/atomic-ops.txt for more information.
 
 config HIGHMEM
         bool "High memory support"
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index f926c7094776..99046b1f51c8 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -253,7 +253,7 @@ __entry_kernel_external_interrupt_reentry:
         andi.p          gr5,#~PSR_ET,gr5
 
         # set CCCR.CC3 to Undefined to abort atomic-modify completion inside the kernel
-        # - for an explanation of how it works, see: Documentation/fujitsu/frv/atomic-ops.txt
+        # - for an explanation of how it works, see: Documentation/frv/atomic-ops.txt
         andi            gr25,#~0xc0,gr25
 
         sti             gr20,@(gr28,#REG_TBR)
@@ -445,7 +445,7 @@ __entry_kernel_softprog_interrupt_reentry:
         sti             gr22,@(sp,#REG_SP)
 
         # set CCCR.CC3 to Undefined to abort atomic-modify completion inside the kernel
-        # - for an explanation of how it works, see: Documentation/fujitsu/frv/atomic-ops.txt
+        # - for an explanation of how it works, see: Documentation/frv/atomic-ops.txt
         movsg           cccr,gr20
         andi            gr20,#~0xc0,gr20
         movgs           gr20,cccr
diff --git a/arch/frv/lib/atomic-ops.S b/arch/frv/lib/atomic-ops.S
index 545cd325ac57..ee0ac905fb08 100644
--- a/arch/frv/lib/atomic-ops.S
+++ b/arch/frv/lib/atomic-ops.S
@@ -1,7 +1,7 @@
 /* atomic-ops.S: kernel atomic operations
  *
  * For an explanation of how atomic ops work in this arch, see:
- *   Documentation/fujitsu/frv/atomic-ops.txt
+ *   Documentation/frv/atomic-ops.txt
  *
  * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)