Merge branch 'for-4.14/wacom' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:14:10 +0000 (11:14 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:14:10 +0000 (11:14 +0200)
commitde6c5070ad3956125fe8d407381c1b18f9749f93
tree2d75a35d43f1e1a5ac8793eab04d4b5886404dc6
parent5c891d5e094c15bd7791dc84749b5239257f5f2d
parent9d14201c7444bbdf89413e88d91b73150c3de38b
Merge branch 'for-4.14/wacom' into for-linus

- name generation improvement for Wacom devices from Jason Gerecke
- Kconfig dependency fix for Wacom driver from Arnd Bergmann
drivers/hid/usbhid/hid-core.c
include/linux/hid.h