Merge branch 'topic/pxa' into for-linus