drm: backmerge tag 'v3.17-rc5' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 16 Sep 2014 01:28:52 +0000 (11:28 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 16 Sep 2014 01:38:04 +0000 (11:38 +1000)
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.


Trivial merge