]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 02:54:20 +0000 (12:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 02:54:20 +0000 (12:54 +1000)
commit77645accb67841c8557483afe029ec80a240d636
treec64069e6b6759a2cefcecee8c9203f8e98dd55cf
parentefa3d86e8acdc324e4e708a9c2b7cc69c2909ae4
parent444c9a08bf787e8236e132fab7eceeb2f065aa4c
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/radeon/radeon_device.c