Merge branch 'stable-3.2' into pandora-3.2

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

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