| commit | 622147fdad5425f6f572f84ce709303e5e0500b7 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Aug 14 18:10:35 2015 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Aug 14 18:11:30 2015 +0200 |
| tree | 9b5adde02ed4481db2dc5011a2c9447c8cac12eb | |
| parent | 5a2376d1360bfc9ebf3b554dd8db1922d42cee4b [diff] | |
| parent | d2944cf21305c754fa8b2d6c1eea05ad5dad7944 [diff] |
Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes Backmerge drm-intel-fixes because a bunch of atomic patch backporting we had to do lead to horrible conflicts. Conflicts: drivers/gpu/drm/drm_crtc.c Just a bit of context conflict between -next and -fixes. drivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c Atomic conflicts, always pick the code from -next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>