Merge branch 'pxa/fixes' into next/fixes