Merge airlied/drm-next into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 3 Oct 2017 09:09:16 +0000 (11:09 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 3 Oct 2017 09:09:16 +0000 (11:09 +0200)
Just catching up with upstream.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1  2 
drivers/gpu/drm/drm_gem.c

Simple merge