Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Kill off I/O cruft for R7780RP.
  sh: Revert lazy dcache writeback changes.
  sh: Enable SM501 support for RTS7751R2D.
  sh: Use L1_CACHE_BYTES for .data.cacheline_aligned.
  sysctl: Support vdso_enabled sysctl on SH.
  sh: Fix kernel thread stack corruption with preempt.
  doc: Add SH to vdso and earlyprintk in kernel-parameters.txt
  sh: Fix sigmask trampling in signal delivery.
  sh: Clear UBC when not in use.

1 files changed, 3 insertions, 2 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6e92ba61f7c0..914119309ddb 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -79,6 +79,7 @@ parameter is applicable:
                         Documentation/scsi/.
         SELINUX SELinux support is enabled.
         SERIAL  Serial support is enabled.
+        SH      SuperH architecture is enabled.
         SMP     The kernel is an SMP kernel.
         SPARC   Sparc architecture is enabled.
         SWSUSP  Software suspend is enabled.
@@ -485,7 +486,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         dtc3181e=       [HW,SCSI]
 
-        earlyprintk=    [IA-32,X86-64]
+        earlyprintk=    [IA-32,X86-64,SH]
                         earlyprintk=vga
                         earlyprintk=serial[,ttySn[,baudrate]]
 
@@ -1784,7 +1785,7 @@ and is between 256 and 4096 characters. It is defined in the file
         usbhid.mousepoll=
                         [USBHID] The interval which mice are to be polled at.
 
-        vdso=           [IA-32]
+        vdso=           [IA-32,SH]
                         vdso=1: enable VDSO (default)
                         vdso=0: disable VDSO mapping