Merge branch 'pxa-palm' into pxa-machines