| commit | 281d1bbd34b734e4f22b30b6f3b673dda46a7470 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Jan 22 10:44:41 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Jan 22 10:44:41 2015 +1000 |
| tree | f67a2d45d248e9deaa1c68d3f8f33cdf476daacd | |
| parent | bfa55bd4990815b055162b6d5d031f37a39942a5 [diff] | |
| parent | b942c653ae265abbd31032f3b4f5f857e5c7c723 [diff] |
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