Merge "ASoC: msm: 8960: set headset plug-type to US by default" into msm-3.0