Merge tag 'v3.14-rc6' into drm-intel-next-queued

[pandora-kernel.git] / drivers / gpu / drm / i915 / intel_panel.c

diff --cc drivers/gpu/drm/i915/intel_panel.c
Simple merge