]> 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)
commit3646a5fe79fcbb3b863722abfec77eb71f14b8ba
treed60f5610f9b36ff05ed5202396c811628bacdb61
parent5cbfc520bc273b9acc28c32d62265ef924cc985f
parentf699fe040eaf426fff2fb10d22a77e2003719b8a
Merge branch 'master' into for-4.20/upstream-fixes

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