Commit 1f6a2b80 authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android 

Conflicts:
	keep -fno-pic flag in arch/arm64/Makefile
parents b52e1c65 e9cd0f1c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment