| commit | 5599617ec0719dba3b1f85a4abca2a6c93368ae3 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jun 02 09:54:12 2016 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jun 02 09:54:12 2016 +0200 |
| tree | 7d2f9bb6a538ee8ed5cfa391f2cfa72a3e2daa9f | |
| parent | 8d19d7d9dbc25d1a1ffa602ed9eff25a88c98163 [diff] | |
| parent | 66fd7a66e8b9e11e49f46ea77910f935c4dee5c3 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Git got absolutely destroyed with all our cherry-picking from drm-intel-next-queued to various branches. It ended up inserting intel_crtc_page_flip 2x even in intel_display.c. Backmerge to get back to sanity. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>