Merge tag 'v3.13-rc4' into core/locking

Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 7 insertions, 4 deletions

diff --git a/arch/alpha/lib/memset.S b/arch/alpha/lib/memset.S
index 311b8cfc6914..76ccc6d1f364 100644
--- a/arch/alpha/lib/memset.S
+++ b/arch/alpha/lib/memset.S
@@ -19,11 +19,13 @@
 .text
         .globl memset
         .globl __memset
+        .globl ___memset
         .globl __memsetw
         .globl __constant_c_memset
-        .ent __memset
+
+        .ent ___memset
 .align 5
-__memset:
+___memset:
         .frame $30,0,$26,0
         .prologue 0
 
@@ -103,7 +105,7 @@ within_one_quad:
 
 end:
         ret $31,($26),1         /* E1 */
-        .end __memset
+        .end ___memset
 
         .align 5
         .ent __memsetw
@@ -121,4 +123,5 @@ __memsetw:
 
         .end __memsetw
 
-memset = __memset
+memset = ___memset
+__memset = ___memset