Merge commit 'f686c812' into head
Change-Id: I1f3e5ffc9e3ef4016f90ac73453524513b4c2cdb
Signed-off-by:
Gopal G Goberu <ggober@codeaurora.org>
Conflicts:
drivers/power/qpnp-linear-charger.c
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Change-Id: I1f3e5ffc9e3ef4016f90ac73453524513b4c2cdb
Signed-off-by:
Gopal G Goberu <ggober@codeaurora.org>
Conflicts:
drivers/power/qpnp-linear-charger.c