Merge branch 'master' into for-4.20/upstream-fixes
authorJiri Kosina <jkosina@suse.cz>
Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
Pull in a merge commit that brought in 3b692c55e58d ("HID: asus: only
support backlight when it's not driven by WMI") so that fixup could be
applied on top of it.

1  2 
MAINTAINERS
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c

diff --cc MAINTAINERS
Simple merge