Merge branch 'for-4.15/alps' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:04:13 +0000 (11:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:04:13 +0000 (11:04 +0100)
commit5cc619db5c34146ee821acd08382b9d78579b52e
treeee28e3cefdb35d56e33887f05db0a50589aa5883
parent83fd5ddc19931d5a5b884c43ee3c9d69c673bc96
parent287b8e11972f934052f4ed0751df465a5e84b69c
Merge branch 'for-4.15/alps' into for-linus

- New ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook Stduio
  and HP Elite book x360) support from Masaki Ota
drivers/hid/hid-core.c
drivers/hid/hid-ids.h