Daniel Vetter 622147fdad 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>		2015-08-14 18:11:30 +02:00
..
amdgpu	Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes	2015-08-14 18:11:30 +02:00
amdkfd	drm/amdkfd: Set correct doorbell packet type for Carrizo	2015-07-20 09:16:49 +03:00
include	drm/amdgpu: Add amdgpu <--> amdkfd gfx8 interface	2015-07-20 09:16:48 +03:00