Merge remote-tracking branch 'asoc/fix/pxa' into asoc-pxa