| commit | b2efb3f0a1db62aff5e824125785ec6731143b6d | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Sep 16 11:28:52 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Sep 16 11:38:04 2014 +1000 |
| tree | 67510cec69e18e55d82bed803428b2a5027d92bb | |
| parent | 4ac073640a528662a7c072a30e92e70ce00ded33 [diff] | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be [diff] |
drm: backmerge tag 'v3.17-rc5' into drm-next This is requested to get the fixes for intel and radeon into the same tree for future development work. i915_display.c: fix missing dev_priv conflict.