Merge branch 'topic/mtk' into for-linus