]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 03:24:15 +0000 (13:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 03:24:15 +0000 (13:24 +1000)
commitc41724bec7988063bfedad96ea838a9a7398e1b5
tree8295f5ab9b3f5cd1c317e4e0a35ed6419fe0b137
parentdb5d5072af149217f69bbfaad207fab9755e3b40
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