Merge branches 'roccat' and 'wacom' into for-linus