Merge branch 'pxa-trizeps' into pxa-machines