| commit | 51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Nov 12 10:29:34 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Nov 12 17:53:30 2014 +1000 |
| tree | 4125e1888cbc215ec4a365457505a407f48e5232 | |
| parent | cc7096fb6d1dfbdac5e7e2675c046fd40646cc66 [diff] | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 [diff] |
Merge tag 'v3.18-rc4' into drm-next backmerge to get vmwgfx locking changes into next as the conflict with per-plane locking.