From: Dave Airlie <airlied@gmail.com>
Date: Thu, 29 Jan 2015 01:45:31 +0000 (+1000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: fixes-v4.0-rc1~91^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3869b17fd63bacb53ac4db4ff4ba093701e17be;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into drm-next

This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
---

b3869b17fd63bacb53ac4db4ff4ba093701e17be
Reading git-diff-tree failed