Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next