]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5d3910b27e0f2201e6126f4e97384bfd6ae77413
treed60f5610f9b36ff05ed5202396c811628bacdb61
parentbdd64d9fe81ba4ca88cca17872570ccc558aaa3b
parenteacd6b940953f3e7cf96422d333b08c3d6ca1b50
Merge branch 'master' into for-4.20/upstream-fixes

Pull in a merge commit that brought in 37b8617e450c ("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