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