| commit | 8d4ad9d4bb0a618c975a32d77087694ec6336f68 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Jun 05 20:28:59 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Jun 05 20:28:59 2014 +1000 |
| tree | d18d12688174a623e3503b11118e44ef8186c90b | |
| parent | 5ea1f752ae04be403a3dc8ec876a60d7f5f6990a [diff] | |
| parent | 9e9a928eed8796a0a1aaed7e0b676db86ba84594 [diff] |
Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next 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