Merge branches 'for-3.10/wiimote' and 'for-3.9/upstream-fixes' into for-linus