diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /arch/arm64/lib/memchr.S | |
parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'arch/arm64/lib/memchr.S')
-rw-r--r-- | arch/arm64/lib/memchr.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/lib/memchr.S b/arch/arm64/lib/memchr.S index 8636b7549163..4444c1d25f4b 100644 --- a/arch/arm64/lib/memchr.S +++ b/arch/arm64/lib/memchr.S @@ -41,4 +41,4 @@ ENTRY(memchr) ret 2: mov x0, #0 ret -ENDPROC(memchr) +ENDPIPROC(memchr) |