1. 23 10月, 2012 14 次提交
  2. 22 10月, 2012 1 次提交
    • D
      Merge tag 'v3.7-rc2' into drm-intel-next-queued · c2fb7916
      Daniel Vetter 提交于
      Linux 3.7-rc2
      
      Backmerge to solve two ugly conflicts:
      - uapi. We've already added new ioctl definitions for -next. Do I need to say more?
      - wc support gtt ptes. We've had to revert this for snb+ for 3.7 and
        also fix a few other things in the code. Now we know how to make it
        work on snb+, but to avoid losing the other fixes do the backmerge
        first before re-enabling wc gtt ptes on snb+.
      
      And a few other minor things, among them git getting confused in
      intel_dp.c and seemingly causing a conflict out of nothing ...
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_reg.h
      	drivers/gpu/drm/i915/intel_display.c
      	drivers/gpu/drm/i915/intel_dp.c
      	drivers/gpu/drm/i915/intel_modes.c
      	include/drm/i915_drm.h
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      c2fb7916
  3. 21 10月, 2012 2 次提交
  4. 20 10月, 2012 23 次提交