| commit | 5d42f82a9b8c5168d75cf59307cd271feca94464 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Aug 05 09:04:59 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Aug 05 09:04:59 2014 +1000 |
| tree | a7049189a2c814589b3ad7e6e776fb736f980967 | |
| parent | c759606c96dc052373d4c36ea383595da46b04e9 [diff] | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 [diff] |
Merge tag 'v3.16' into drm-next Linux 3.16 backmerge requested by i915, nouveau and radeon authors Conflicts: drivers/gpu/drm/i915/i915_gem_render_state.c drivers/gpu/drm/i915/intel_drv.h