Merge branch 'for-4.15/asus' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:06:22 +0000 (11:06 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:06:22 +0000 (11:06 +0100)
commit47dd6b019edd9fc17ddc5b8c16690c80266cdbde
tree029654a40f39c4c9ad26a1728e455222200f20f1
parent5cc619db5c34146ee821acd08382b9d78579b52e
parent339ee3fcbdab736adbc30b7a3d675005c61a2a40
Merge branch 'for-4.15/asus' into for-linus

- Asus laptop fixes (fn keys, backlight), from Mustafa Kuscu and
  Maxime Belleng√©
drivers/hid/hid-core.c
drivers/hid/hid-ids.h