From: Dave Airlie <airlied@redhat.com>
Date: Tue, 16 Sep 2014 01:28:52 +0000 (+1000)
Subject: drm: backmerge tag 'v3.17-rc5' into drm-next
X-Git-Tag: fixes-against-v3.18-rc2~73^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2efb3f0a1db62aff5e824125785ec6731143b6d;p=pandora-kernel.git

drm: backmerge tag 'v3.17-rc5' into drm-next

This is requested to get the fixes for intel and radeon into the
same tree for future development work.

i915_display.c: fix missing dev_priv conflict.
---

b2efb3f0a1db62aff5e824125785ec6731143b6d
Reading git-diff-tree failed