Merge remote-tracking branch 'asoc/fix/wm5100' into tmp