Dave Airlie 281d1bbd34 Merge remote-tracking branch 'origin/master' into drm-next ...

Backmerge Linus tree after rc5 + drm-fixes went in.

There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.

Conflicts:
	drivers/gpu/drm/amd/amdkfd/Makefile
	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
	drivers/gpu/drm/i915/intel_runtime_pm.c
	drivers/gpu/drm/radeon/radeon_kfd.c

2015-01-22 10:44:41 +10:00

..

cik_structs.h

drm/amd: Put cik structures in a common place

2015-01-02 23:18:39 +02:00

kgd_kfd_interface.h

Merge remote-tracking branch 'origin/master' into drm-next

2015-01-22 10:44:41 +10:00