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