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

Skip to content
Commit a700d352 authored by Pradosh Das's avatar Pradosh Das
Browse files

Merge commit '52e55f37' into HEAD 



Conflicts:
	drivers/devfreq/bimc-bwmon.c
	drivers/power/smb135x-charger.c

Change-Id: Idf456f0c3481daa544dde3ff77328bcba78c8869
Signed-off-by: default avatarPradosh Das <prados@codeaurora.org>
parents e6ebe40c 52e55f37
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