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

Commit 806bfa99 authored by Ashwini Muduganti's avatar Ashwini Muduganti
Browse files

Merge commit '871eac76' on remote branch. 



Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>

Conflicts:
	arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi
	arch/arm64/boot/dts/qcom/sdmmagpie.dtsi

Change-Id: I1a5b6f7294546cc17b3b93792053411c24651187
Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>
parents 533b2539 871eac76
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