Merge branch 'pxa-tosa' into pxa