Merge branch 'topic/hsu' into for-linus