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)
- name generation improvement for Wacom devices from Jason Gerecke
- Kconfig dependency fix for Wacom driver from Arnd Bergmann

1  2 
drivers/hid/usbhid/hid-core.c
include/linux/hid.h

Simple merge
Simple merge