]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm-intel/for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 03:18:45 +0000 (14:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 03:18:45 +0000 (14:18 +1100)
commit2787f1882ee742e96e68e33fe1888c43f9f7f88b
treece5156b21f27a01cf773af2e253dcf7ef0784948
parent409eee8714b0c7098437e747719171ec07e74844
parent89eff4bea721700d1f4d5ffd3fdc99bb0de9e962
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c