Merge branch 'pxa-plat' into devel