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

Skip to content
Commit 9d6021d6 authored by Abhishek Ranjan's avatar Abhishek Ranjan
Browse files

Merge commit '60b25567' 



Conflicts:
	drivers/platform/msm/qpnp-power-on.c
	include/linux/qpnp/power-on.h

Change-Id: Id285843733d3d11bd4c37212ec66b44130896d1e
Signed-off-by: default avatarAbhishek Ranjan <aranja@codeaurora.org>
parents 29165c4c 60b25567
Hide 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