git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ea1f75 9e9a928)
Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 5 Jun 2014 10:28:59 +0000 (20:28 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 5 Jun 2014 10:28:59 +0000 (20:28 +1000)
Merge drm-fixes into drm-next.

Both i915 and radeon need this done for later patches.

Conflicts:
drivers/gpu/drm/drm_crtc_helper.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


Trivial merge
Pandora Kernel Repository