Merge branch 'pxa/devel' into next/devel2