Takashi Iwai 59c8231089 Merge branch 'for-linus' into for-next ... Conflicts: drivers/gpu/drm/i915/intel_pm.c		2015-12-23 08:33:34 +01:00
..
amdgpu	Merge branch 'for-linus' into for-next	2015-12-23 08:33:34 +01:00
amdkfd	amdkfd: use <linux/mman.h> instead of <uapi/asm-generic/mman-common.h>	2015-08-30 12:36:58 +03:00
include	Merge branch 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next	2015-11-05 10:57:25 +10:00
scheduler	drm/amdgpu: fix race condition in amd_sched_entity_push_job	2015-12-02 15:04:04 -05:00