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)
commit0c7244209588630a9b45e52490ef1390e04499a6
treed60f5610f9b36ff05ed5202396c811628bacdb61
parent399474e4c1100bca264ed14fa3ad0d68fab484d8
parenteb7046e9bf466cebfcfbcdf640e41d9e3a80086c
Merge branch 'master' into for-4.20/upstream-fixes

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.
MAINTAINERS
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c