Merge branch 'for-4.17/elecom' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:16:37 +0000 (13:16 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:16:37 +0000 (13:16 +0200)
commita9ef00aec7633b3be3b19a7fce9a8d13f5a07c1c
treea4bbd266b0567e10ebaf896ae5092f1c43f0fec8
parentb55dc1dc2790e69e45baf97243e28f258c6d5062
parentfbb77e88f08ce04daa9b1ff2381be7ebc9f24b6f
Merge branch 'for-4.17/elecom' into for-linus

Support for new elecom device.
drivers/hid/hid-ids.h
drivers/hid/hid-quirks.c