Merge branch 'for-5.4/wacom' into for-linus