Merge branch 'uhid' into for-linus