Merge branch 'machtypes' into pxa-palm