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, 9 insertions, 12 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index cf3868956f1e..9ad4e6fc56fd 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -549,7 +549,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         1 will print _a lot_ more information - normally
                         only useful to kernel developers.
 
-        decnet=         [HW,NET]
+        decnet.addr=    [HW,NET]
                         Format: <area>[,<node>]
                         See also Documentation/networking/decnet.txt.
 
@@ -1561,14 +1561,17 @@ and is between 256 and 4096 characters. It is defined in the file
         ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
                         See Documentation/ramdisk.txt.
 
-        rcu.blimit=     [KNL,BOOT] Set maximum number of finished
-                        RCU callbacks to process in one batch.
+        rcupdate.blimit=        [KNL,BOOT]
+                        Set maximum number of finished RCU callbacks to process
+                        in one batch.
 
-        rcu.qhimark=    [KNL,BOOT] Set threshold of queued
+        rcupdate.qhimark=       [KNL,BOOT]
+                        Set threshold of queued
                         RCU callbacks over which batch limiting is disabled.
 
-        rcu.qlowmark=   [KNL,BOOT] Set threshold of queued
-                        RCU callbacks below which batch limiting is re-enabled.
+        rcupdate.qlowmark=      [KNL,BOOT]
+                        Set threshold of queued RCU callbacks below which
+                        batch limiting is re-enabled.
 
         rdinit=         [KNL]
                         Format: <full_path>
@@ -1888,9 +1891,6 @@ and is between 256 and 4096 characters. It is defined in the file
         st=             [HW,SCSI] SCSI tape parameters (buffers, etc.)
                         See Documentation/scsi/st.txt.
 
-        st0x=           [HW,SCSI]
-                        See header of drivers/scsi/seagate.c.
-
         sti=            [PARISC,HW]
                         Format: <num>
                         Set the STI (builtin display/keyboard on the HP-PARISC
@@ -1975,9 +1975,6 @@ and is between 256 and 4096 characters. It is defined in the file
         tipar.delay=    [HW,PPT]
                         Set inter-bit delay in microseconds (default 10).
 
-        tmc8xx=         [HW,SCSI]
-                        See header of drivers/scsi/seagate.c.
-
         tmscsim=        [HW,SCSI]
                         See comment before function dc390_setup() in
                         drivers/scsi/tmscsim.c.