+2
−6
+15
−0
+119
−0
Loading
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>