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)
- Asus laptop fixes (fn keys, backlight), from Mustafa Kuscu and
  Maxime Belleng√©

1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge