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

Commit 98238cf5 authored by jenkins_auto's avatar jenkins_auto
Browse files

Merge branch 'Bitra2' into Bitra.LA.2.0 

 Conflicts:
	drivers/power/supply/qcom/step-chg-jeita.c
	drivers/usb/pd/policy_engine.c
parents d4648d62 350e1191
Expand all 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