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