| commit | bc96ad6722f86a377ed2872c9a4854c90caf78ca | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Jan 25 14:35:44 2021 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Jan 25 14:35:44 2021 +1000 |
| tree | ece8859165a1faa10e4e2203d231fc7e87925139 | |
| parent | d82afcf9caaac26ce2642511115bca9dacf30f41 [diff] | |
| parent | 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 [diff] |
Merge tag 'v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next Backmerge v5.11-rc5 into drm-next to clean up a bunch of conflicts we are dragging around. Signed-off-by: Dave Airlie <airlied@redhat.com>