Merge branch 'topic/sprd' into for-linus