Merge branch 'pxa-devel' into pxa