]> 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>
Mon, 2 Dec 2013 01:12:04 +0000 (12:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Dec 2013 01:12:04 +0000 (12:12 +1100)
commite578dd7d54bcec7deab80833b2ce29bdec40040c
tree51246925f274da313c6bfb5de4bb062a776ff065
parentdcea321026ee6a0ae38c2e1ffe7970df2743bb71
parentbe46ffd48ba34189336c6fe420ff3370dcd36c60
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_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.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_opregion.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_uncore.c