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

Commit 138f2c35 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:
	drivers/base/power/opp/core.c
parents 2bf79551 1a1a512b
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