Merge remote-tracking branches 'asoc/topic/samsung' and 'asoc/topic/wm8750' into...