Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus