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

4 files changed, 5 insertions, 6 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 25c10fa69647..028d8a0fdbfd 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -206,9 +206,8 @@ config SMP
           singleprocessor machines. On a singleprocessor machine, the kernel
           will run faster if you say N here.
 
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available
-          at <http://www.tldp.org/docs.html#howto>.
+          See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+          available at <http://www.tldp.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
 
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 395bbce64993..e10d25d2d9c9 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -305,7 +305,7 @@ flush_user_cache_page_non_current(struct vm_area_struct *vma,
         /* save the current process space and pgd */
         unsigned long space = mfsp(3), pgd = mfctl(25);
 
-        /* we don't mind taking interrups since they may not
+        /* we don't mind taking interrupts since they may not
          * do anything with user space, but we can't
          * be preempted here */
         preempt_disable();
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 04848b2b381c..84b9611a9228 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -1187,7 +1187,7 @@ static struct hp_hardware hp_hardware_list[] __devinitdata = {
         {HPHW_FIO, 0x005, 0x000A9, 0x00, "AllegroLow Core PCI USB KB"}, 
         {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI SuperIO RS-232"}, 
         {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI USB KB"}, 
-        {HPHW_FIO, 0x007, 0x000A9, 0x0, "Miscelaneous PCI Plug-in"}, 
+        {HPHW_FIO, 0x007, 0x000A9, 0x0, "Miscellaneous PCI Plug-in"},
         {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI SuperIO RS-232"}, 
         {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI USB KB"}, 
         {HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"}, 
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 2ce3806f02e1..58fccc96d003 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -333,7 +333,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         flush_user_icache_range((unsigned long) &frame->tramp[0],
                            (unsigned long) &frame->tramp[TRAMP_SIZE]);
 
-        /* TRAMP Words 0-4, Lenght 5 = SIGRESTARTBLOCK_TRAMP
+        /* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP
          * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP
          * So the SIGRETURN_TRAMP is at the end of SIGRESTARTBLOCK_TRAMP
          */