| commit | 0c7244209588630a9b45e52490ef1390e04499a6 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Nov 06 13:57:02 2018 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Nov 06 13:57:02 2018 +0100 |
| tree | d60f5610f9b36ff05ed5202396c811628bacdb61 | |
| parent | 399474e4c1100bca264ed14fa3ad0d68fab484d8 [diff] | |
| parent | eb7046e9bf466cebfcfbcdf640e41d9e3a80086c [diff] |
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.