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)
commit17aad8a340e6f98b62c2482d02bc3814eebde9a5
treeb03fc5a159452bd24cde6e08f29bc66ce6bfa154
parent7e6328fd1f84f366b4cc17dc757025f485139f1a
parent99743ae4c5f52f8f8ceb17783056fcc9b4f8b64c
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next

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>