Merge branch 'topic/uniphier' into for-linus