git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
[pandora-kernel.git]
/
arch
/
arm
/
lib
/
copy_to_user.S
diff --git
a/arch/arm/lib/copy_to_user.S
b/arch/arm/lib/copy_to_user.S
index
027b69b
..
d066df6
100644
(file)
--- a/
arch/arm/lib/copy_to_user.S
+++ b/
arch/arm/lib/copy_to_user.S
@@
-93,6
+93,7
@@
WEAK(__copy_to_user)
#include "copy_template.S"
ENDPROC(__copy_to_user)
+ENDPROC(__copy_to_user_std)
.pushsection .fixup,"ax"
.align 0