]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm-intel/for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Dec 2013 00:57:24 +0000 (11:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Dec 2013 00:57:24 +0000 (11:57 +1100)
commit3655530128cde673b57031628e27ca1095c0a87f
tree0d249c05b22385e1854fed400dc376e3d23a20b4
parent0a13ffd7a718edc9db1f753b4a46266d638f26b1
parentc461562e84d180fb691af57f93a42bd9cc7eb69c
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_display.c
12 files changed:
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_context.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c