• Daniel Vetter's avatar
    Merge tag 'v3.10-rc2' into drm-intel-next-queued · e1b73cba
    Daniel Vetter authored
    Backmerge Linux 3.10-rc2 since the various (rather trivial) conflicts
    grew a bit out of hand. intel_dp.c has the only real functional
    conflict since the logic changed while dev_priv->edp.bpp was moved
    around.
    
    Also squash in a whitespace fixup from Ben Widawsky for
    i915_gem_gtt.c, git seems to do something pretty strange in there
    (which I don't fully understand tbh).
    
    Conflicts:
    	drivers/gpu/drm/i915/i915_reg.h
    	drivers/gpu/drm/i915/intel_dp.c
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    e1b73cba
intel_drv.h 26.7 KB