Commit 24284529 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18 

 Conflicts:
	add cpufeature.o in arch/arm64/kernel/Makefile
parents ffded77e b36eba9b
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