| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Mar 09 19:58:30 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Mar 09 19:58:30 2015 +1000 |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 | |
| parent | 8dd0eb3566711d81bfbe2b4421b33f0dd723cec4 [diff] | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 [diff] |
Merge tag 'v4.0-rc3' into drm-next Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get some mainline bug fixes needed for my testing box Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c