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

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

Merge commit '94e53480' into HEAD 



Conflicts:
        kernel/module.c

Change-Id: Ib0c5bfe4a20e033bb25df61ada9cf9211578c16f
Signed-off-by: default avatarPradosh Das <prados@codeaurora.org>
parents 05e4bacd 94e53480
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