tree f67a2d45d248e9deaa1c68d3f8f33cdf476daacd
parent bfa55bd4990815b055162b6d5d031f37a39942a5
parent b942c653ae265abbd31032f3b4f5f857e5c7c723
author Dave Airlie <airlied@redhat.com> 1421887481 +1000
committer Dave Airlie <airlied@redhat.com> 1421887481 +1000

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