Merge branch 'pxa-all' into devel