Various small tweaks from morfic and franco

Conflicts:
	arch/arm/boot/dts/msm8974-hammerhead/msm8974-hammerhead.dtsi