Merge branch 'pxa-cleanup' into devel