Merge branch 'for-4.17/hid-elan' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:17:23 +0000 (13:17 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:17:23 +0000 (13:17 +0200)
commit7a8c1c4e71e4c694e2c9a05f565dd5dac43faa40
tree522cd3622948f0eb1bbd38e76870ef0dec3836b6
parentd463fd44c4d620b6f96f9f56474fbd42cb663a84
parent9a6a4193d65b853020ef0e66cecdf9e64a863883
Merge branch 'for-4.17/hid-elan' into for-linus

Pull new hid-elan driver, currently providing support for touchpad
found in certain HP Pavilion x2 laptops.
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-ids.h
drivers/hid/hid-quirks.c