From: Jiri Kosina Date: Tue, 6 Nov 2018 12:57:02 +0000 (+0100) Subject: Merge branch 'master' into for-4.20/upstream-fixes X-Git-Tag: microblaze-v5.1-rc1~19^2~25 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=0c7244209588630a9b45e52490ef1390e04499a6;p=linux-2.6-microblaze.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