From: Dave Airlie <airlied@redhat.com>
Date: Wed, 20 May 2015 06:23:53 +0000 (+1000)
Subject: Backmerge v4.1-rc4 into into drm-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~17^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdcddf95e82b1c4e370fc1196b1f4f50f775dab4;p=pandora-kernel.git

Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c
---

bdcddf95e82b1c4e370fc1196b1f4f50f775dab4
Reading git-diff-tree failed