• D
    Merge tag 'v3.4-rc3' into drm-intel-next-queued · 76787890
    Daniel Vetter 提交于
    Backmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things
    that conflict/depend upon patches in -rc3:
    - Second part of the Sandybridge workaround series - it changes some
      of the same registers.
    - Preparation for Chris Wilson's fencing cleanup - we need the fix
      from -rc3 merged before we can move around all that code.
    - Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,
      but should be enabled on all generations in 3.5.
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_i2c.c
    Signed-Off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
    76787890
i915_drv.c 31.1 KB