| commit | 2da80b57c69a2a5ae0e16dead8cdbfab46f970bc | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jan 18 08:04:23 2016 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jan 18 08:18:16 2016 +0100 |
| tree | 402529def53a1b32066493f5581c3e1810d11a1d | |
| parent | 2d7f3bdb2cf6656386cb9ca1b02dd6df66fb05e8 [diff] | |
| parent | 1df59b8497f47495e873c23abd6d3d290c730505 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Pull in Dave's drm-next pull request to have a clean base for 4.6. Also, we need the various atomic state extensions Maarten recently created. Conflicts are just adjacent changes that all resolve to nothing in git diff. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>