Resolve merge conflict

ChangeLog

@@ -9556,6 +9556,8 @@
 	  interrupts are automatically restored when the wait happens.  But
 	  with CONFIG_NET_NOINTS=y, the wait blocks with the network locked --
 	  bad style and also can lead to a deadlock condition (2015-01-28).
+	* arch/arm/src/armv7-a/arm_memcpy.S and arch/arm/src/armv7-m/up_memcpy.S:
+	  ARM assembly language memcpy.S's were not returning a value in R0 they
+	  are required to do.  From David Sidrane (2015-01-29).
 	* net/local:  Extend Unix domain socket support to include support
 	  for datagram Unix domain sockets (2015-01-29).
-

arch/arm/src/armv7-a/arm_memcpy.S

@@ -143,11 +143,26 @@ MEM_LongCopyTable:
  * Input Parameters:
  *   r0 = destination, r1 = source, r2 = length
  *
+ * Returned Value:
+ *   r0 = destination r1-r3 burned
+ *
  ************************************************************************************/
 
+	.align 4
 	.thumb_func
+
 memcpy:
 	push	{r14}
+	push    {r0}
+	bl      _do_memcpy
+	pop     {r0}
+	pop     {pc}
+
+	.align 4
+
+	.thumb_func
+_do_memcpy:
+	push    {r14}
 
 	/* This allows the inner workings to "assume" a minimum amount of bytes */
 	/* Quickly check for very short copies */

arch/arm/src/armv7-m/up_memcpy.S

@@ -142,11 +142,26 @@ MEM_LongCopyTable:
  * Input Parameters:
  *   r0 = destination, r1 = source, r2 = length
  *
+ * Returned Value:
+ *   r0 = destination r1-r3 burned
+ *
  ************************************************************************************/
 
+	.align 4
 	.thumb_func
+
 memcpy:
 	push	{r14}
+	push    {r0}
+	bl      _do_memcpy
+	pop     {r0}
+	pop     {pc}
+
+	.align 4
+
+	.thumb_func
+_do_memcpy:
+	push    {r14}
 
 	/* This allows the inner workings to "assume" a minimum amount of bytes */
 	/* Quickly check for very short copies */