On Mon, Sep 30, 2013 at 1:26 PM, Thierry Reding <thierry.reding@xxxxxxxxx> 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 -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
