From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 6 Nov 2018 12:57:02 +0000 (+0100)
Subject: Merge branch 'master' into for-4.20/upstream-fixes
X-Git-Tag: v5.15~7221^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c7244209588630a9b45e52490ef1390e04499a6;p=platform%2Fkernel%2Flinux-starfive.git

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.
---

0c7244209588630a9b45e52490ef1390e04499a6