Merge "defconfig: enabled flash driver support with TPS61310" into msm-3.0