Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 16 Mar 2016 07:11:09 +0000 (08:11 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 16 Mar 2016 10:18:25 +0000 (11:18 +0100)
commit31fa684096601d8fe5ea11e1c4d473229fef7c70
tree5e355028e1afb00483177796d60252c25ce9823d
parent359d2243117a79599435141fda0047d01ef324e8
parent86d65b7e7a0c927d07d18605c276d0f142438ead
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 <daniel.vetter@intel.com>
drivers/gpu/drm/i915/intel_dp.c