Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus