Merge airlied/drm-next into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Fri, 18 Aug 2017 14:52:44 +0000 (10:52 -0400)
committerSean Paul <seanpaul@chromium.org>
Fri, 18 Aug 2017 14:52:44 +0000 (10:52 -0400)
Archit requested this backmerge to facilitate merging some patches
depending on changes between -rc2 & -rc5

Signed-off-by: Sean Paul <seanpaul@chromium.org>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge