| commit | 64282ea2d2a90437c0739ce016b80a1dec16507e | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jul 27 09:33:49 2017 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jul 27 09:33:49 2017 +0200 |
| tree | f1d484bb588a0739fda81db193325cf0c0d553ea | |
| parent | d2939424ff89f1ee3aeefdd030cba6ba163e77ac [diff] | |
| parent | e6742e1021a5cec55fab50a0b115c65217488eda [diff] |
Merge airlied/drm-next into drm-intel-next-queued Resync with upstream to avoid git getting too badly confused. Also, we have a conflict with the drm_vblank_cleanup removal, which cannot be resolved by simply taking our side. Bake that in properly. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>