Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
authorSean Paul <seanpaul@chromium.org>
Tue, 27 Jun 2017 15:36:28 +0000 (11:36 -0400)
committerSean Paul <seanpaul@chromium.org>
Tue, 27 Jun 2017 15:36:28 +0000 (11:36 -0400)
Backmerge drm-next with rc7


Trivial merge