Merge branch 'for-4.14/asus' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:05:28 +0000 (11:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:05:28 +0000 (11:05 +0200)
commitd3c7ad2432115b0b53fb838c14b8ad9ad72f7254
tree014d9ae6c1bd9aaae54f2d99e362fc4eec576465
parentd487bb6ef121357bd4cd42fe2b08a6857ed26525
parent73c75d395857960ea135913da7bb9537248a11e6
Merge branch 'for-4.14/asus' into for-linus

- T100 touchpad support from Hans de Goede
drivers/hid/hid-core.c
drivers/hid/hid-ids.h