Merge tag 'asoc-v3.17-rc4' into asoc-linus