Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/arm/sha1_arm.S b/arm/sha1_arm.S
index 8c1cb99fb403875af85e4d1524d21f7eb818f59b..41e92636e0ff98ac620de75d66917999d55aca9e 100644 (file)
--- a/arm/sha1_arm.S
+++ b/arm/sha1_arm.S
@@ -10,7 +10,7 @@
  */
 
        .text
-       .globl  sha_transform
+       .globl  arm_sha_transform
 
 /*
  * void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
@@ -18,7 +18,7 @@
  * note: the "data" pointer may be unaligned.
  */
 
-sha_transform:
+arm_sha_transform:
 
        stmfd   sp!, {r4 - r8, lr}