Merge branch 'topic/ti-xbar' into for-linus