Merge branch 'pxa-fixes'