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

Commit a057484a 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:
	also change cpu_enable_uao in arch/arm64/include/asm/processor.h
	comment unmatch fixed in arch/arm64/kernel/suspend.c
parents 3ba1692e c95b7f1f
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