Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a79bee58 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:
	arch/arm64/kernel/head.S
	arch/arm64/mm/Makefile
parents ef59ba11 e0ac66e0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment