• Daniel Vetter's avatar
    Merge tag 'v3.12-rc2' into drm-intel-next · b599c89e
    Daniel Vetter authored
    Backmerge Linux 3.12-rc2 to prep for a bunch of -next patches:
    - Header cleanup in intel_drv.h, both changed in -fixes and my current
      -next pile.
    - Cursor handling cleanup for -next which depends upon the cursor
      handling fix merged into -rc2.
    
    All just trivial conflicts of the "changed adjacent lines" type:
    	drivers/gpu/drm/i915/i915_gem.c
    	drivers/gpu/drm/i915/intel_display.c
    	drivers/gpu/drm/i915/intel_drv.h
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    b599c89e
i915_gem_stolen.c 11.9 KB