Files
Thierry Strudel f40df1df68 Merge remote-tracking branch 'msm-qcom/android-msm-8998-4.4-common' into android-msm-wahoo-4.4
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
2017-04-28 16:56:47 -07:00
..