Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa