Merge branch 'du44' of https://github.com/k5t4j5/kernel_htc_trinity into du44

Conflicts:
	arch/arm/boot/dts/msm8974pro-pm8941.dtsi
	arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
	arch/arm/boot/dts/msm8974pro.dtsi
Merge branch 'du44' of https://github.com/k5t4j5/kernel_htc_trinity into du44