| commit | 41206a073ceebc517245677a19f52ba6379b33a9 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Jul 24 08:28:09 2020 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Jul 24 08:48:05 2020 +1000 |
| tree | 2fc35aac6abe32b99058ad55b0fc6e4d449d1056 | |
| parent | 206739119508d5ab4b42ab480ff61a7e6cd72d7c [diff] | |
| parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 [diff] |
Merge v5.8-rc6 into drm-next I've got a silent conflict + two trees based on fixes to merge. Fixes a silent merge with amdgpu Signed-off-by: Dave Airlie <airlied@redhat.com>