Merge tag 'asoc-v3.15-3' into asoc-linus