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