Merge branches 'pxa-core' and 'pxa-machines' into pxa-all