| commit | 2e79e22e092acd55da0b2db066e4826d7d152c41 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Oct 23 12:02:47 2019 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Oct 23 12:10:05 2019 +0200 |
| tree | e7ec9782c0b7831c511af711424126a2b9a4eb07 | |
| parent | f1b4a9217efd61d0b84c6dc404596c8519ff6f59 [diff] | |
| parent | 7d194c2100ad2a6dded545887d02754948ca5241 [diff] |
Merge v5.4-rc4 into drm-next
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.
Some adjacent changes conflicts, plus some clashes in i915 due to
cherry-picking and git trying to be helpful and leaving both versions
in.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>