| commit | 94558e265b9539b2ecec98d037bae51c902663c1 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Aug 05 10:36:15 2016 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Aug 05 10:36:15 2016 +0200 |
| tree | e2782bc903759c2a8bf0af9b3a8ec090a3b1bd3e | |
| parent | 5ac9056753e79ac5ad1ccc3c99b311688e46e8c9 [diff] | |
| parent | 1cf915d305b6e1d57db6c35c208016f9747ba3c6 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Backmerge the 4.8 pull request state from Dave - conflicts were getting out of hand, and Chris has some patches which outright don't apply without everything merged together again. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>