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