Merge branch 'master' into upstream-fixes

115 files changed, 3201 insertions, 1416 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 61060e82fb..4e1e8175eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2065,8 +2065,12 @@ P:	Matthew Wilcox
 M:      matthew@wil.cx
 P:      Grant Grundler
 M:      grundler@parisc-linux.org
+P:      Kyle McMartin
+M:      kyle@parisc-linux.org
 L:      parisc-linux@parisc-linux.org
 W:      http://www.parisc-linux.org/
+T:      git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
+T:      cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:      Maintained
 
 PCI ERROR RECOVERY
diff --git a/arch/alpha/lib/strncpy.S b/arch/alpha/lib/strncpy.S
index 338551c711..bbdef1be5f 100644
--- a/arch/alpha/lib/strncpy.S
+++ b/arch/alpha/lib/strncpy.S
@@ -43,8 +43,8 @@ strncpy:
 
         .align  4
 $multiword:
-        subq    $24, 1, $2      # clear the final bits in the prev word
-        or      $2, $24, $2
+        subq    $27, 1, $2      # clear the final bits in the prev word
+        or      $2, $27, $2
         zapnot  $1, $2, $1
         subq    $18, 1, $18
 
@@ -70,8 +70,8 @@ $multiword:
         bne     $18, 0b