| commit | c19941218c9a1cae578dfbf30190b13b9cdb9aa8 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jun 16 14:18:30 2016 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jun 16 14:18:30 2016 +0200 |
| tree | 0014d2ac89e6209c565f5a8fc53abd8dce13e63e | |
| parent | 1c1a24d2db35d9e1b6d2a012a7d51af8be8011ac [diff] | |
| parent | a0877f52035280370707bdefeddc6faa6478b892 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Backmerge drm-next to get at the nonblocking atomic helpers, needed to merge the i915 conversion. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>