From: Daniel Vetter Date: Wed, 16 Mar 2016 07:11:09 +0000 (+0100) Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31fa684096601d8fe5ea11e1c4d473229fef7c70;p=linux-beck.git Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Backmerge because: - Maarten needs latest atomic patches from drm-misc. - Lionel needs the color manager core patch from drm-misc. - Ander extracted intel_dpll_mgr.c, we need a backmerge to avoid git losing track of things too often (right now it seems ok due to cherry-picks). - Tvrtko needs a stable baseline to apply some large-scale renaming patches to i915 GEM code. Signed-off-by: Daniel Vetter --- 31fa684096601d8fe5ea11e1c4d473229fef7c70