From: Dave Airlie <airlied@redhat.com>
Date: Thu, 22 Jan 2015 00:44:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master' into drm-next
X-Git-Tag: fixes-v4.0-rc1~91^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=281d1bbd34b734e4f22b30b6f3b673dda46a7470;p=pandora-kernel.git

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
---

281d1bbd34b734e4f22b30b6f3b673dda46a7470
Reading git-diff-tree failed