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

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

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4 

Conflicts:
	set ARM64_WORKAROUND_CAVIUM_27456 to 12 in
	arch/arm64/include/asm/cpufeature.h
	and add asm/memory.h in arch/arm64/kernel/entry.S
parents 57378734 1d074db6
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