Config update

Conflicts:
	arch/arm/configs/msm8974_sec_defconfig