On Mon, Sep 30, 2013 at 1:26 PM, Thierry Reding thierry.reding@gmail.com wrote:
Today's linux-next merge of the drm-intel tree got conflicts in
drivers/gpu/drm/i915/intel_display.c
I fixed it up (see below). Please check if the resolution looks correct.
Looks good. -Daniel