Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 1 Feb 2017 08:06:26 +0000 (09:06 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 1 Feb 2017 08:06:26 +0000 (09:06 +0100)
Backmerge to resync and also so that Ville can apply a cleanup patch
from Takashi.

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

diff --cc MAINTAINERS
Simple merge