Conflicts: arch/arm/boot/dts/qcom/Makefile arch/arm64/Kconfig arch/arm64/Makefile drivers/power/supply/qcom/battery.c scripts/Makefile.lib Change-Id: I5d59b4df33d458c890db903e3567176469e60f0b
Conflicts: arch/arm/boot/dts/qcom/Makefile arch/arm64/Kconfig arch/arm64/Makefile drivers/power/supply/qcom/battery.c scripts/Makefile.lib Change-Id: I5d59b4df33d458c890db903e3567176469e60f0b