Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus