Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus