| commit | cc9263874b42bf98209dce0afe698b550648e770 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Aug 15 10:41:47 2016 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Aug 15 10:41:47 2016 +0200 |
| tree | f0eafd344c501e420de06c2e0f29f2ae0e6a9a1b | |
| parent | 02bef8f98d26e9774b49c78a42b29b168e8876fc [diff] | |
| parent | fc93ff608b15ae32cde3006b7af860b59cac20ec [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Backmerge because too many conflicts, and also we need to get at the latest struct fence patches from Gustavo. Requested by Chris Wilson. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>