From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2014 10:28:59 +0000 (+1000)
Subject: Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~44^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d4ad9d4bb0a618c975a32d77087694ec6336f68;p=pandora-kernel.git

Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next

Merge drm-fixes into drm-next.

Both i915 and radeon need this done for later patches.

Conflicts:
	drivers/gpu/drm/drm_crtc_helper.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/i915_gem_gtt.c
---

8d4ad9d4bb0a618c975a32d77087694ec6336f68
Reading git-diff-tree failed