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