Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus