Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus