Merge branch 'topic/sun6i' into for-linus