Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
[pandora-kernel.git] / drivers / gpu / drm / i915 / intel_display.c
Simple merge