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.

diff --combined Documentation/kernel-parameters.txt
index 6e92ba61f7c0ea18b86557eec2bd17f2ece5d9ca,757dd994b879c6b37178ce5fb8b2c67c8b935df5..914119309ddbdcf045793ea7fceabf7fd5183ac1
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -79,6 -79,7 +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 +486,7 @@@ and is between 256 and 4096 characters
  
        dtc3181e=       [HW,SCSI]
  
-       earlyprintk=    [IA-32,X86-64]
+       earlyprintk=    [IA-32,X86-64,SH]
                        earlyprintk=vga
                        earlyprintk=serial[,ttySn[,baudrate]]
  
@@@ -1685,22 -1686,6 +1686,22 @@@
        stifb=          [HW]
                        Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]]
  
 +      sunrpc.pool_mode=
 +                      [NFS]
 +                      Control how the NFS server code allocates CPUs to
 +                      service thread pools.  Depending on how many NICs
 +                      you have and where their interrupts are bound, this
 +                      option will affect which CPUs will do NFS serving.
 +                      Note: this parameter cannot be changed while the
 +                      NFS server is running.
 +
 +                      auto        the server chooses an appropriate mode
 +                                  automatically using heuristics
 +                      global      a single global pool contains all CPUs
 +                      percpu      one pool for each CPU
 +                      pernode     one pool for each NUMA node (equivalent
 +                                  to global on non-NUMA machines)
 +
        swiotlb=        [IA-64] Number of I/O TLB slabs
  
        switches=       [HW,M68k]
@@@ -1784,7 -1769,7 +1785,7 @@@
        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