Merge branch 'topic/ti' into for-linus