Merge branches 'wiimote' and 'upstream-fixes' into for-linus