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
..
2014-12-15 18:06:13 -08:00
2014-12-14 14:57:16 -08:00
2014-12-30 15:08:16 +01:00
2014-12-19 12:57:45 -08:00
2014-12-08 12:56:01 +08:00
2014-12-11 17:48:14 -08:00
2014-09-23 23:44:16 -07:00
2014-11-24 22:25:13 +00:00