Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 3 Feb 2017 10:09:25 +0000 (11:09 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 3 Feb 2017 10:09:36 +0000 (11:09 +0100)
Yet another backmerge to get at latest etnaviv code, which is need for
Chris' drm_mm patch.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Trivial merge