merge in 108

Conflicts:
	arch/arm/boot/dts/apq8074-rhine_togari_windy.dtsi
	arch/arm/boot/dts/msm8974.dtsi
fix merge errors/build errors
fix merge errors/build errors